diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c5dac2..915adeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ # Check the syntax, semantics and layout of DDLm dictionaries -name: CIFSyntaxandStyleCheck +name: CIF Syntax and Style Check # Controls when the action will run. Triggers the workflow on push or pull # request events but only for the main branch @@ -45,6 +45,24 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Checkout the DDLm reference dictionary + uses: actions/checkout@v4 + with: + repository: COMCIFS/DDLm + path: cif-dictionaries/DDLm + + - name: Checkout enumeration templates + uses: actions/checkout@v4 + with: + repository: COMCIFS/Enumeration_Templates + path: cif-dictionaries/Enumeration_Templates + + - name: Checkout attribute templates + uses: actions/checkout@v4 + with: + repository: COMCIFS/Attribute_Templates + path: cif-dictionaries/Attribute_Templates + - name: Checkout the coreCIF dictionary uses: actions/checkout@v4 with: @@ -76,7 +94,7 @@ jobs: - name: Install Julia packages if: steps.cache.outputs.cache-hit != 'true' run: | - julia -e 'import Pkg;Pkg.add("CrystalInfoFramework");Pkg.add("Lerche");Pkg.add("FilePaths");Pkg.add("ArgParse")' + julia -e 'import Pkg;Pkg.add("CrystalInfoFramework");Pkg.add("Lerche");Pkg.add("ArgParse")' - name: Checkout uses: actions/checkout@v4 @@ -89,12 +107,35 @@ jobs: repository: jamesrhester/julia_cif_tools path: julia_cif_tools + - name: Checkout the DDLm reference dictionary + uses: actions/checkout@v4 + with: + repository: COMCIFS/DDLm + path: DDLm + + - name: Checkout enumeration templates + uses: actions/checkout@v4 + with: + repository: COMCIFS/Enumeration_Templates + path: enum + + - name: Checkout attribute templates + uses: actions/checkout@v4 + with: + repository: COMCIFS/Attribute_Templates + path: templ + - name: Checkout the coreCIF dictionary uses: actions/checkout@v4 with: repository: COMCIFS/cif_core path: cif_core + - name: Move template files to the expected location + run: | + mv enum/templ_enum.cif cif_core/templ_enum.cif + mv templ/templ_attr.cif cif_core/templ_attr.cif + - name: Run diagnostics run: | ls -a @@ -107,7 +148,7 @@ jobs: for file in main/*.dic do echo "Checking $file" - julia -O0 ./julia_cif_tools/linter.jl -i $PWD/cif_core $file cif_core/ddl.dic + julia -O0 ./julia_cif_tools/linter.jl -i $PWD/cif_core $file $PWD/DDLm/ddl.dic if [ $? != 0 ] then exit 1 ; diff --git a/multi_block_core.dic b/multi_block_core.dic index c72936c..6e0f113 100644 --- a/multi_block_core.dic +++ b/multi_block_core.dic @@ -10,7 +10,7 @@ data_MULTIBLOCK_DIC _dictionary.title MULTIBLOCK_DIC _dictionary.class Instance _dictionary.version 1.1.0 - _dictionary.date 2025-11-28 + _dictionary.date 2026-01-19 _dictionary.uri ;\ https://raw.githubusercontent.com/COMCIFS/MultiBlock_Dictionary/main/\ @@ -1419,7 +1419,7 @@ save_ ; All multi-block items from core 3.2.0 added. ; - 1.1.0 2025-11-28 + 1.1.0 2026-01-19 ; # Update date above and add audit comments below. Remove this comment when ready for release.