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
47 changes: 44 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 ;
Expand Down
4 changes: 2 additions & 2 deletions multi_block_core.dic
Original file line number Diff line number Diff line change
Expand Up @@ -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/\
Expand Down Expand Up @@ -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.
Expand Down