Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v4
- name: Check out the target repository
uses: actions/checkout@v6

# Check syntax of all CIF files
- name: Check CIF syntax
Expand All @@ -42,29 +42,29 @@ jobs:
needs: syntax

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check out the target repository
uses: actions/checkout@v6

- name: Checkout the DDLm reference dictionary
uses: actions/checkout@v4
- name: Check out the DDLm reference dictionary
uses: actions/checkout@v6
with:
repository: COMCIFS/DDLm
path: cif-dictionaries/DDLm

- name: Checkout enumeration templates
uses: actions/checkout@v4
- name: Check out enumeration templates
uses: actions/checkout@v6
with:
repository: COMCIFS/Enumeration_Templates
path: cif-dictionaries/Enumeration_Templates

- name: Checkout attribute templates
uses: actions/checkout@v4
- name: Check out attribute templates
uses: actions/checkout@v6
with:
repository: COMCIFS/Attribute_Templates
path: cif-dictionaries/Attribute_Templates

- name: Checkout the coreCIF dictionary
uses: actions/checkout@v4
- name: Check out the coreCIF dictionary
uses: actions/checkout@v6
with:
repository: COMCIFS/cif_core
path: cif-dictionaries/cif_core
Expand All @@ -78,55 +78,59 @@ jobs:
runs-on: ubuntu-latest
needs: syntax

env:
JULIA_VERSION: '1.10'
JULIA_DEP_FILE: 'julia_cif_tools/Project.toml'

steps:
- name: Install Julia
uses: julia-actions/setup-julia@v3
with:
version: ${{ env.JULIA_VERSION }}

- name: Check out Julia tools
uses: actions/checkout@v6
with:
repository: jamesrhester/julia_cif_tools
path: julia_cif_tools

- name: Get the cache
uses: actions/cache@v4
uses: actions/cache@v5
id: cache
with:
path: ~/.julia
key: ${{ runner.os }}-julia-v2

- name: Install Julia
uses: julia-actions/setup-julia@v1
with:
version: '1.10'
key: ${{ runner.os }}-julia-${{ env.JULIA_VERSION }}-${{ hashFiles(env.JULIA_DEP_FILE) }}

- name: Install Julia packages
if: steps.cache.outputs.cache-hit != 'true'
run: |
julia -e 'import Pkg;Pkg.add("CrystalInfoFramework");Pkg.add("Lerche");Pkg.add("ArgParse")'
julia -e 'using Pkg, TOML; map(Pkg.add, collect(keys(TOML.parsefile("${{ env.JULIA_DEP_FILE }}")["deps"]))); Pkg.instantiate()'

- name: Checkout
uses: actions/checkout@v4
- name: Check out the target repository
uses: actions/checkout@v6
with:
path: main

- name: Checkout julia tools
uses: actions/checkout@v4
with:
repository: jamesrhester/julia_cif_tools
path: julia_cif_tools

- name: Checkout the DDLm reference dictionary
uses: actions/checkout@v4
- name: Check out the DDLm reference dictionary
uses: actions/checkout@v6
with:
repository: COMCIFS/DDLm
path: DDLm

- name: Checkout enumeration templates
uses: actions/checkout@v4
- name: Check out enumeration templates
uses: actions/checkout@v6
with:
repository: COMCIFS/Enumeration_Templates
path: enum

- name: Checkout attribute templates
uses: actions/checkout@v4
- name: Check out attribute templates
uses: actions/checkout@v6
with:
repository: COMCIFS/Attribute_Templates
path: templ

- name: Checkout the coreCIF dictionary
uses: actions/checkout@v4
- name: Check out the coreCIF dictionary
uses: actions/checkout@v6
with:
repository: COMCIFS/cif_core
path: cif_core
Expand Down
4 changes: 2 additions & 2 deletions cif_ed.dic
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ data_CIF_ED
_dictionary.title CIF_ED
_dictionary.class Instance
_dictionary.version 1.0.1-dev
_dictionary.date 2026-01-19
_dictionary.date 2026-05-02
_dictionary.uri
https://raw.githubusercontent.com/COMCIFS/cif_ed/main/cif_ed.dic
_dictionary.ddl_conformance 4.2.0
Expand Down Expand Up @@ -813,7 +813,7 @@ save_
of the definitions in this dictionary may be copies of core
definitions with extended attributes.
;
1.0.1-dev 2026-01-19
1.0.1-dev 2026-05-02
;
# Please update the date above and describe the change below until
# ready for the next release
Expand Down
Loading