more rearranging

DUNE · Jan 27, 2025 · 67518da · 67518da
1 parent 44578b0
commit 67518da
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 107 deletions.
diff --git a/.github/workflows/CDImage.yml b/.github/workflows/CDImage.yml
@@ -1,65 +1,69 @@
 ---
-# Update MaCh3 container image registry with newest updates
-name: Image CD
-
-# The events that trigger the workflow
-on:
-  push:
-    branches:
-      - develop
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-  packages: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false  # KS: Prevents cancellation of remaining jobs if one fails
-      matrix:
-        include:
-          - os: alma9
-            file: doc/MaCh3DockerFiles/Alma9/Dockerfile
-            tag_latest: alma9latest
-
-    name: Image CD ${{ matrix.os }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Build Docker image
-        run: |
-          if [ "${{ github.ref_type }}" == "tag" ]; then
-            docker build . \
-              --file "${{ matrix.file }}" \
-              --tag "ghcr.io/dune/mach3:${{ matrix.os }}${{ github.ref_name }}" \
-              --build-arg MACH3_DUNE_VERSION="${{ github.ref_name }}" 
-          else
-            docker build . \
-              --file "${{ matrix.file }}" \
-              --tag "ghcr.io/dune/mach3:${{ matrix.tag_latest }}" \
-              --build-arg MACH3_DUNE_VERSION="develop" 
-          fi
-
-      - name: Push Docker image
-        run: |
-          if [ "${{ github.ref_type }}" == "tag" ]; then
-            docker push "ghcr.io/dune/mach3:${{ matrix.os }}${{ github.ref_name }}"
-          else
-            docker push "ghcr.io/dune/mach3:${{ matrix.tag_latest }}"
-          fi
-
-      - name: Delete old images
-        uses: actions/delete-package-versions@v5
-        with:
-          package-name: 'mach3'
-          package-type: 'container'
-          min-versions-to-keep: 5
-          delete-only-untagged-versions: 'true'
+  # Update MaCh3 container image registry with newest updates
+  name: Image CD
+
+  # The events that trigger the workflow
+  on:
+    push:
+      branches:
+        - develop
+      tags:
+        - 'v*'
+
+  permissions:
+    contents: read
+    packages: write
+
+  jobs:
+    build:
+      runs-on: ubuntu-latest
+      strategy:
+        fail-fast: false  # KS: Prevents cancellation of remaining jobs if one fails
+        matrix:
+          include:
+            - os: alma9
+              file: doc/MaCh3DockerFiles/Alma9/Dockerfile
+              tag_latest: alma9latest
+            - os: Ubuntu22.04
+              file: doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
+              tag_latest: ubuntulatest
+
+
+      name: Image CD ${{ matrix.os }}
+
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+
+        - name: Log in to GitHub Container Registry
+          run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+        - name: Build Docker image
+          run: |
+            if [ "${{ github.ref_type }}" == "tag" ]; then
+              docker build . \
+                --file "${{ matrix.file }}" \
+                --tag "ghcr.io/dune/mach3:${{ matrix.os }}${{ github.ref_name }}" \
+                --build-arg MACH3_DUNE_VERSION="${{ github.ref_name }}" 
+            else
+              docker build . \
+                --file "${{ matrix.file }}" \
+                --tag "ghcr.io/dune/mach3:${{ matrix.tag_latest }}" \
+                --build-arg MACH3_DUNE_VERSION="develop" 
+            fi
+  
+        - name: Push Docker image
+          run: |
+            if [ "${{ github.ref_type }}" == "tag" ]; then
+              docker push "ghcr.io/dune/mach3:${{ matrix.os }}${{ github.ref_name }}"
+            else
+              docker push "ghcr.io/dune/mach3:${{ matrix.tag_latest }}"
+            fi
+  
+        - name: Delete old images
+          uses: actions/delete-package-versions@v5
+          with:
+            package-name: 'mach3'
+            package-type: 'container'
+            min-versions-to-keep: 5
+            delete-only-untagged-versions: 'true'
diff --git a/.github/workflows/CIBuild.yml b/.github/workflows/CIBuild.yml
@@ -1,42 +1,43 @@
 ---
-# Check if MaCh3 compiles correctly
-
-name: Build CI
-
-# The events that trigger the workflow
-on:
-  pull_request:
-    branches: [ develop  ]
+  # Check if MaCh3 compiles correctly
 
-permissions:
-  contents: read
-  packages: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false  # KS: Prevents cancellation of remaining jobs if one fails
-      matrix:
-        include:
-          - os: Alma9
-            file: doc/MaCh3DockerFiles/Alma9/Dockerfile
-            tag: alma9latest
-          - os: Ubuntu22.04
-            file: doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
-            tag: ubuntulatest
-
-    name: Build CI ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Log in to GitHub Container Registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-    - name: Build the Docker image
-      run: |
-        docker build . \
-          --file ${{ matrix.file }} \
-          --tag ghcr.io/dune/mach3:${{ matrix.tag }} \
-          --build-arg MACH3_DUNE_VERSION=${{ github.head_ref }} 
+  name: Build CI
+
+  # The events that trigger the workflow
+  on:
+    pull_request:
+      branches: [ develop  ]
+
+  permissions:
+    contents: read
+    packages: write
+
+  jobs:
+    build:
+      runs-on: ubuntu-latest
+      strategy:
+        fail-fast: false  # KS: Prevents cancellation of remaining jobs if one fails
+        matrix:
+          include:
+            - os: Alma9
+              file: doc/MaCh3DockerFiles/Alma9/Dockerfile
+              tag: alma9latest
+            - os: Ubuntu22.04
+              file: doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
+              tag: ubuntulatest
+
+      name: Build CI ${{ matrix.os }}
+
+      steps:
+      - uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Build the Docker image
+        run: |
+          docker build . \
+            --file ${{ matrix.file }} \
+            --tag ghcr.io/dune/mach3:${{ matrix.tag }} \
+            --build-arg MACH3_DUNE_VERSION=${{ github.head_ref }} 
+  
diff --git a/.github/workflows/EventRates.yml b/.github/workflows/EventRates.yml
@@ -27,9 +27,6 @@ jobs:
       options: --privileged -v /cvmfs:/cvmfs:shared
 
     steps:
-      # Checkout the repository code
-      - uses: actions/checkout@v4
-
       # Set up CVMFS
       - name: Set up CVMFS
         uses: cvmfs-contrib/github-action-cvmfs@v4
@@ -40,6 +37,10 @@ jobs:
           echo "Checking CVMFS..."
           ls /cvmfs/dune.osgstorage.org/pnfs/fnal.gov/usr/dune/persistent/stash/MaCh3/inputs/TDR/v1
 
+      # Checkout the repository code
+      - uses: actions/checkout@v4
+
+
       # Build the code
       - name: Build Code
         run: |