Merge pull request #37 from vaitkus/update-github-actions

Update GitHub actions

Author: jamesrhester

.github/workflows/main.yml

@@ -1,99 +1,115 @@
-# Check that syntax is correct
+# Check the syntax, semantics and layout of DDLm dictionaries
 
 name: CIFSyntaxandStyleCheck
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# Controls when the action will run. Triggers the workflow on push or pull
+# request events but only for the main branch
 on:
   push:
-    branches: [ master ]
+    branches:
+      - main
     paths-ignore:
-            - '.github/**'
+      - '.github/**'
 
   pull_request:
-    branches: [ master ]
+    branches:
+      - main
     paths-ignore:
-            - '.github/**'
-  workflow_dispatch:   
+      - '.github/**'
+
+  workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   syntax:
-    # The type of runner that the job will run on
+    name: Syntax
     runs-on: ubuntu-latest
 
     # 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@v2
-          
+      - name: Checkout
+        uses: actions/checkout@v4
+
       # Check syntax of all CIF files
-        - name: check_syntax
-          uses: COMCIFS/cif_syntax_check_action@master
-          id: cif_syntax_check
-  ddlm:
+      - name: Check CIF syntax
+        uses: COMCIFS/cif_syntax_check_action@master
+        id: cif_syntax_check
+
+  semantics:
+    name: Semantics
     runs-on: ubuntu-latest
     needs: syntax
+
     steps:
-        - name: checkout
-          uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Checkout the coreCIF dictionary
+        uses: actions/checkout@v4
+        with:
+          repository: COMCIFS/cif_core
+          path: cif-dictionaries/cif_core
+
+      - name: Run dictionary validity checks
+        uses: COMCIFS/dictionary_check_action@main
+        id: ddlm_check
 
-        - name: check_ddlm
-          uses: COMCIFS/dictionary_check_action@main
-          id: ddlm_check
   layout:
+    name: Layout
     runs-on: ubuntu-latest
     needs: syntax
 
     steps:
       - name: Get the cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache
         with:
-                 path: ~/.julia
-                 key: ${{ runner.os }}-julia-v2
-                 
+          path: ~/.julia
+          key: ${{ runner.os }}-julia-v2
+
       - name: Install Julia
         uses: julia-actions/setup-julia@v1
         with:
-                version: '1.9'
+          version: '1.9'
 
       - 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("FilePaths");Pkg.add("ArgParse")'
 
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-                path: main
-      - name: checkout julia tools
-        uses: actions/checkout@v2
+          path: main
+
+      - name: Checkout julia tools
+        uses: actions/checkout@v4
         with:
-                repository: jamesrhester/julia_cif_tools
-                path: julia_cif_tools
+          repository: jamesrhester/julia_cif_tools
+          path: julia_cif_tools
 
-      - name: Checkout CIF master files
-        uses: actions/checkout@v2
+      - name: Checkout the coreCIF dictionary
+        uses: actions/checkout@v4
         with:
-                repository: COMCIFS/cif_core
-                path: cif_core
-      - name: Diagnostics
+          repository: COMCIFS/cif_core
+          path: cif_core
+
+      - name: Run diagnostics
         run: |
-            ls -a
-            pwd
-            which julia
+          ls -a
+          pwd
+          which julia
 
-      - name: one_dict_layout
+      - name: Run dictionary layout checks
         run: |
-               julia -e 'using Pkg; Pkg.status()'
-               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
-                  if [ $? != 0 ] 
-                  then 
-                    exit 1 ;
-                  fi 
-               done
+          julia -e 'using Pkg; Pkg.status()'
+          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
+            if [ $? != 0 ]
+            then
+              exit 1 ;
+            fi
+          done