From bbd68e9cd57d37d63dd2af61127b334367bb1a59 Mon Sep 17 00:00:00 2001
From: Tim Theisen <tim@cs.wisc.edu>
Date: Thu, 18 Jul 2024 12:58:22 -0500
Subject: [PATCH 1/4] HTCONDOR-2544: build and test with current platforms

---
 .github/workflows/build_and_test_rpms.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_and_test_rpms.yml b/.github/workflows/build_and_test_rpms.yml
index d308f778..bf149bd9 100644
--- a/.github/workflows/build_and_test_rpms.yml
+++ b/.github/workflows/build_and_test_rpms.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build-rpms-and-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -12,10 +12,10 @@ jobs:
           - almalinux:9
         target_env:
           - uw_build
-          - osg-3.6
-          - osg-3.6-testing
-          - osg-3.6-upcoming
-          - osg-3.6-upcoming-testing
+          - osg-23
+          - osg-23-testing
+          - osg-23-upcoming
+          - osg-23-upcoming-testing
     steps:
       - uses: actions/checkout@v3
         with:

From 20062b6c5a44bf83702210a35281ff53b877a295 Mon Sep 17 00:00:00 2001
From: Tim Theisen <tim@cs.wisc.edu>
Date: Thu, 18 Jul 2024 16:05:28 -0500
Subject: [PATCH 2/4] Try Ubuntu 22.04

---
 .github/workflows/build_and_test_rpms.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test_rpms.yml b/.github/workflows/build_and_test_rpms.yml
index bf149bd9..d4284678 100644
--- a/.github/workflows/build_and_test_rpms.yml
+++ b/.github/workflows/build_and_test_rpms.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build-rpms-and-test:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

From 05d97ee3772c7dc535af90db9638038de7aff5d8 Mon Sep 17 00:00:00 2001
From: Tim Theisen <tim@cs.wisc.edu>
Date: Thu, 18 Jul 2024 16:07:16 -0500
Subject: [PATCH 3/4] Back to Ubuntu 20.04 for build and test

---
 .github/workflows/build_and_test_rpms.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test_rpms.yml b/.github/workflows/build_and_test_rpms.yml
index d4284678..316615e2 100644
--- a/.github/workflows/build_and_test_rpms.yml
+++ b/.github/workflows/build_and_test_rpms.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build-rpms-and-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:

From bb19b87153bf3b3c9f432607c81d4cd59699ff6b Mon Sep 17 00:00:00 2001
From: Tim Theisen <tim@cs.wisc.edu>
Date: Thu, 18 Jul 2024 16:22:12 -0500
Subject: [PATCH 4/4] Fix up OSG_SERIES

---
 tests/build_rpms.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh
index d23e052a..ce65921f 100755
--- a/tests/build_rpms.sh
+++ b/tests/build_rpms.sh
@@ -62,6 +62,7 @@ yum -y install \
 
 if [[ $BUILD_ENV == osg* ]]; then
     OSG_SERIES=$(cut -d- -f2 <<< "$BUILD_ENV")
+    OSG_SERIES="${OSG_SERIES}-main"
     yum install -y https://repo.opensciencegrid.org/osg/${OSG_SERIES}/osg-${OSG_SERIES}-el${OS_VERSION}-release-latest.rpm
 else
     # This is currently tracking the 10.x feature release.