From e9958794354750662c50bb707bacc09e75304085 Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Wed, 26 Aug 2026 16:32:03 -0500
Subject: [PATCH 1/3] Add OSG 26 builds to software-base, drop 24 builds

---
 .github/workflows/build-container.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index afea671..cd53996 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -35,10 +35,10 @@ jobs:
             # ^^ see scripts/create-alma10-base.sh for how this gets created
             tag_str: 'el10'
         repo: ['development', 'testing', 'release']
-        series: ['24', '25']
+        series: ['25', '26']
         exclude:
-          - series: '24'
-            base: {image: 'hub.opensciencegrid.org/osg-htc/alma10-base:combo', tag_str: 'el10'}
+          - series: '26'
+            repo: 'release' # TODO: OSG 26 is not yet released
     needs: make-date-tag
     steps:
     - name: checkout docker-software-base

From 63b9cf4a9e8572ded1a454cf1e90342e3f62081d Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Thu, 27 Aug 2026 09:58:25 -0500
Subject: [PATCH 2/3] Add GHA for rebuilding the alma10 base

---
 .github/workflows/build-alma10-base.yaml | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/build-alma10-base.yaml

diff --git a/.github/workflows/build-alma10-base.yaml b/.github/workflows/build-alma10-base.yaml
new file mode 100644
index 0000000..ef5c5ce
--- /dev/null
+++ b/.github/workflows/build-alma10-base.yaml
@@ -0,0 +1,32 @@
+name: build-alma10-base
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'  # once a week on Sundays at midnight
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: install podman
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y podman  
+        
+    - name: checkout docker-software-base
+      uses: actions/checkout@v3
+      
+    - name: Log in to OSG Harbor
+      uses: docker/login-action@v2.2.0
+      with:
+        registry: hub.opensciencegrid.org
+        username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
+        password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
+
+    - name: Build alma10-base image
+      run: |
+        yes no | scripts/create-alma10-base.sh
+
+    - name: Push alma10-base image to OSG Harbor
+      run: |
+        podman manifest push hub.opensciencegrid.org/osg-htc/alma10-base:combo

From b5f10dc3f5520887eabb41a23cbb6bee3501c02e Mon Sep 17 00:00:00 2001
From: mwestphall <westphall@wisc.edu>
Date: Thu, 27 Aug 2026 13:10:58 -0500
Subject: [PATCH 3/3] Use fixed hashes for GHA dependencies

Co-authored-by: Matyas Selmeci <mselmeci@wisc.edu>
---
 .github/workflows/build-alma10-base.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-alma10-base.yaml b/.github/workflows/build-alma10-base.yaml
index ef5c5ce..5068a49 100644
--- a/.github/workflows/build-alma10-base.yaml
+++ b/.github/workflows/build-alma10-base.yaml
@@ -14,10 +14,10 @@ jobs:
         sudo apt-get install -y podman  
         
     - name: checkout docker-software-base
-      uses: actions/checkout@v3
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       
     - name: Log in to OSG Harbor
-      uses: docker/login-action@v2.2.0
+      uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
       with:
         registry: hub.opensciencegrid.org
         username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}