Separate the checks so that we get a more complete set of results

Author: ocaisa

.github/workflows/test-eb-hooks.yml

@@ -1,13 +1,56 @@
 # documentation: https://help.github.com/en/articles/workflow-syntax-for-github-actions
-name: Check whether eb_hooks.py script is up-to-date
+name: Run checks on EasyBuild hooks script
 on:
   push:
   pull_request:
   workflow_dispatch:
 permissions:
   contents: read # to fetch code (actions/checkout)
 jobs:
-  check_eb_hooks:
+  check_eb_hooks_uptodate:
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        EESSI_VERSION:
+          - '2023.06'
+          - '2025.06'
+
+    steps:
+        - name: Check out software-layer repository
+          uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+        - name: Mount EESSI CernVM-FS repository
+          uses: eessi/github-action-eessi@v3
+          with:
+            eessi_stack_version: ${{matrix.EESSI_VERSION}}
+            use_eessi_module: true
+
+        - name: Check whether eb_hooks.py script is up-to-date
+          if: ${{ github.event_name == 'pull_request' }}
+          run: |
+              FILE="eb_hooks.py"
+              TEMP_FILE="$(mktemp)"
+
+              # Fetch base branch
+              git fetch origin ${{ github.base_ref }}
+
+              # Check if the hooks has changed in the PR
+              if git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -q "^$FILE$"; then
+                echo "Hooks changed in PR. Using PR version."
+                cp "$FILE" "$TEMP_FILE"
+              else
+                echo "File not changed in PR. Using default branch version."
+                git show origin/${{ github.base_ref }}:$FILE > "$TEMP_FILE"
+              fi
+
+              # replace <EESSI_VERSION> placeholder (as is also done in install_scripts.sh)
+              sed -i "s/<EESSI_VERSION>/${{matrix.EESSI_VERSION}}/g" "${TEMP_FILE}"
+
+              # Compare the hooks to what is shipped in the repository
+              module load EESSI-extend
+              diff "$TEMP_FILE" "$EASYBUILD_HOOKS"
+
+  check_eb_hooks_functionality:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
@@ -26,16 +69,14 @@ jobs:
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-          with:
-              fetch-depth: 0  # Fetch all history for all branches and tags
 
         - name: Mount EESSI CernVM-FS repository
           uses: eessi/github-action-eessi@v3
           with:
             eessi_stack_version: ${{matrix.EESSI_VERSION}}
             use_eessi_module: true
 
-        - name: Test that toolchain verification check works
+        - name: Test that hook toolchain verification check works
           if: ${{ github.event_name == 'pull_request' }}
           run: |
               # Set up some environment variables
@@ -53,28 +94,3 @@ jobs:
 
               # Check the override works
               EESSI_OVERRIDE_TOOLCHAIN_CHECK=1 eb --hooks=$PWD/eb_hooks.py "$INCOMPATIBLE_EASYCONFIG" --stop fetch
-
-        - name: Check that EasyBuild hook is up to date
-          if: ${{ github.event_name == 'pull_request' }}
-          run: |
-              FILE="eb_hooks.py"
-              TEMP_FILE="$(mktemp)"
-
-              # Fetch base branch
-              git fetch origin ${{ github.base_ref }}
-
-              # Check if the hooks has changed in the PR
-              if git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -q "^$FILE$"; then
-                echo "Hooks changed in PR. Using PR version."
-                cp "$FILE" "$TEMP_FILE"
-              else
-                echo "File not changed in PR. Using default branch version."
-                git show origin/${{ github.base_ref }}:$FILE > "$TEMP_FILE"
-              fi
-
-              # replace <EESSI_VERSION> placeholder (as is also done in install_scripts.sh)
-              sed -i "s/<EESSI_VERSION>/${{matrix.EESSI_VERSION}}/g" "${TEMP_FILE}"
-
-              # Compare the hooks to what is shipped in the repository
-              module load EESSI-extend
-              diff "$TEMP_FILE" "$EASYBUILD_HOOKS"