testing simplified workflow

Author: maureeungaro

.github/workflows/sanitize.yml

@@ -1,4 +1,5 @@
 name: Sanitize
+
 permissions:
   contents: read
 
@@ -10,12 +11,14 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push:
-    branches: [ main ]
-    tags: [ 'v*' ]
+  workflow_dispatch:
+  pull_request:
     paths-ignore:
       - "**/*.md"
-  pull_request:
+
+  merge_group:
+  push:
+    branches: [ main ]
     paths-ignore:
       - "**/*.md"
 
@@ -28,20 +31,22 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - id: scan
         name: Build matrix
         shell: bash
         run: |
           set -euo pipefail
-          ./ci/sanitizers_tags.sh
+          ./ci/distros_tags.sh
 
       - name: Fail if matrix is empty
         shell: bash
         run: |
           set -euo pipefail
           if [[ -z "${{ steps.scan.outputs.matrix_sanitize }}" ]]; then
-            echo "matrix_sanitize output is empty. Check ci/sanitizers_tags.sh writing to GITHUB_OUTPUT."
+            echo "matrix_sanitize output is empty. Check ci/distros_tags.sh writing to GITHUB_OUTPUT."
             exit 1
           fi
 
@@ -51,7 +56,7 @@ jobs:
           echo '${{ steps.scan.outputs.matrix_sanitize }}'
 
   build-with-sanitizer:
-    name: ${{ matrix.baseos }}/${{ matrix.baseos_tag }} ${{ matrix.arch }} ${{ matrix.sanitizer }}
+    name: ${{ matrix.image }}/${{ matrix.image_tag }} ${{ matrix.arch }} ${{ matrix.sanitizer }}
     needs: [ discover ]
     strategy:
       fail-fast: false
@@ -62,46 +67,45 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
-      - name: Sanitizer - ${{ matrix.sanitizer }}
+      - name: Build and test
         shell: bash
         env:
           GEMC_SKIP_PYTHON_ENV_INSTALL: "1"
         run: |
           set -euo pipefail
-          
-          echo "Starting manual build for sanitizer: ${{ matrix.sanitizer }}"
-          
           export DOCKER_ENTRYPOINT_SOURCE_ONLY=1
           . /usr/local/bin/docker-entrypoint.sh
-          module load geant4/"${{ matrix.g4v }}"
-          
+          module load geant4/"${{ matrix.geant4_tag }}"
           ./ci/build.sh "${{ matrix.sanitizer }}"
-          
-          echo "Manual build for sanitizer: ${{ matrix.sanitizer }} completed"
 
       - name: Package sanitizer logs
         if: ${{ always() }} # run regardless of earlier step outcomes
         shell: bash
         run: |
           set -euo pipefail
+          echo "LOG_TAR=" >> "$GITHUB_ENV"
           src="/root/src/logs"
           outdir="$GITHUB_WORKSPACE/_artifacts"
+          tarball="logs-${{ matrix.image }}-${{ matrix.arch }}-${{ matrix.sanitizer }}.tgz"
           mkdir -p "$outdir"
 
           if [[ -d "$src" ]]; then
-            tar -C "/root/src" -czf "$outdir/logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}.tgz" "logs"
+            tar -C "/root/src" -czf "$outdir/$tarball" "logs"
+            echo "LOG_TAR=$outdir/$tarball" >> "$GITHUB_ENV"
             echo "Packaged logs from $src"
           else
             echo "No logs directory at $src"
           fi
 
       - name: Upload sanitizer logs (artifact)
-        if: ${{ always() }} # run regardless of earlier step outcomes
+        if: ${{ always() && env.LOG_TAR != '' }}
         uses: actions/upload-artifact@v7
         with:
-          name: logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}
-          path: ${{ github.workspace }}/_artifacts/logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}.tgz
+          name: logs-${{ matrix.image }}-${{ matrix.arch }}-${{ matrix.sanitizer }}
+          path: ${{ env.LOG_TAR }}
           if-no-files-found: warn
           retention-days: 14
 

.github/workflows/test.yml

@@ -1,15 +1,10 @@
-# Build and test GEMC images without publishing containers.
 name: Test
 
 permissions:
   contents: read
-  packages: read
 
 env:
-  GEMC_TAG: dev
-  GEANT4_TAG: 11.4.1
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  DOCKER_BUILD_SUMMARY: false
 
 concurrency:
   group: gemc-test-${{ github.ref }}
@@ -24,13 +19,12 @@ on:
   merge_group:
   push:
     branches: [ main ]
-    tags: [ '*' ]
     paths-ignore:
       - "**/*.md"
 
 jobs:
   discover:
-    name: Create Job Matrix
+    name: Create job matrix
     runs-on: ubuntu-latest
     outputs:
       matrix_build: ${{ steps.scan.outputs.matrix_build }}
@@ -42,7 +36,24 @@ jobs:
 
       - id: scan
         name: Build matrix
-        run: ci/distros_tags.sh
+        shell: bash
+        run: |
+          set -euo pipefail
+          ./ci/distros_tags.sh
+
+      - name: Fail if matrix is empty
+        shell: bash
+        run: |
+          set -euo pipefail
+          if [[ -z "${{ steps.scan.outputs.matrix_build }}" ]]; then
+            echo "matrix_build output is empty. Check ci/distros_tags.sh writing to GITHUB_OUTPUT."
+            exit 1
+          fi
+
+      - name: Show matrix (debug)
+        shell: bash
+        run: |
+          echo '${{ steps.scan.outputs.matrix_build }}'
 
   build:
     name: ${{ matrix.image }}/${{ matrix.image_tag }} ${{ matrix.arch }}
@@ -51,83 +62,45 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.discover.outputs.matrix_build) }}
-    env:
-      CACHE_REF: type=registry,ref=ghcr.io/${{ github.repository }}:cache-test-${{ matrix.arch }}
+    container: ${{ matrix.container }}
+
     steps:
-      - name: Checkout repository
+      - name: Checkout
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Free up disk space
-        uses: ./.github/actions/free-disk-space
-        with:
-          prune_docker: "true"
-          show_tree: "true"
-
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v4
+      - name: Build and test
+        shell: bash
 
-      - name: Log in to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate Dockerfile
-        shell: bash
         run: |
-          python3 ci/dockerfile_creator.py \
-            -i "${{ matrix.image }}" \
-            -t "${{ matrix.image_tag }}" \
-            --gemc-version "${{ matrix.gemc_tag || env.GEMC_TAG }}" \
-            --geant4-version "${{ matrix.geant4_tag || env.GEANT4_TAG }}" \
-            --source context \
-            > Dockerfile.generated
-          cat Dockerfile.generated
-
-      - name: Build and test
-        uses: docker/build-push-action@v7
-        with:
-          pull: true
-          context: .
-          file: ./Dockerfile.generated
-          target: final
-          platforms: ${{ matrix.platform }}
-          push: false
-          cache-from: ${{ env.CACHE_REF }}
-
-      - name: Export logs
-        uses: docker/build-push-action@v7
-        with:
-          pull: true
-          context: .
-          file: ./Dockerfile.generated
-          target: logs-export
-          platforms: ${{ matrix.platform }}
-          push: false
-          cache-from: ${{ env.CACHE_REF }}
-          outputs: type=local,dest=${{ runner.temp }}/artifacts/${{ matrix.logs_dir }}
+          set -euo pipefail
+          export DOCKER_ENTRYPOINT_SOURCE_ONLY=1
+          . /usr/local/bin/docker-entrypoint.sh
+          module load geant4/"${{ matrix.geant4_tag || env.GEANT4_TAG }}"
+          ./ci/build.sh
 
       - name: Pack logs
+        if: ${{ always() }}
         shell: bash
         run: |
           set -euo pipefail
           echo "LOG_TAR=" >> "$GITHUB_ENV"
-          LOGROOT="${{ runner.temp }}/artifacts/${{ matrix.logs_dir }}"
+          LOGROOT="/root/src"
+          OUTDIR="$GITHUB_WORKSPACE/_artifacts"
           TAR="logs-${{ matrix.gemc_tag }}-${{ matrix.image }}-${{ matrix.image_tag }}"
           TAR="${TAR}-${{ matrix.arch }}.tgz"
           if [[ -d "$LOGROOT/logs" ]]; then
-            cd "$LOGROOT"
-            tar -czf "$TAR" logs
-            echo "LOG_TAR=$LOGROOT/$TAR" >> "$GITHUB_ENV"
+            mkdir -p "$OUTDIR"
+            tar -C "$LOGROOT" -czf "$OUTDIR/$TAR" logs
+            echo "LOG_TAR=$OUTDIR/$TAR" >> "$GITHUB_ENV"
           else
             echo "No exported logs found at $LOGROOT/logs"
           fi
 
       - name: Upload logs
-        if: ${{ env.LOG_TAR != '' }}
+        if: ${{ always() && env.LOG_TAR != '' }}
         uses: actions/upload-artifact@v7
         with:
           name: logs-${{ matrix.gemc_tag }}-${{ matrix.image }}-${{ matrix.image_tag }}-${{ matrix.arch }}