From f083c988ac1d0c6456a643d6a07b5ca0ec55ecad Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 5 Nov 2025 13:42:26 -0600 Subject: [PATCH 1/4] Add missing osg-stage1-el10-include.lst --- osg-stage1-el10-include.lst | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 osg-stage1-el10-include.lst diff --git a/osg-stage1-el10-include.lst b/osg-stage1-el10-include.lst new file mode 100644 index 0000000..8ff8a14 --- /dev/null +++ b/osg-stage1-el10-include.lst @@ -0,0 +1,3 @@ +./usr/bin/cpio +./usr/lib64/libpsl.so.5 +./usr/lib64/libpsl.so.5.3.5 From d8943ddd569d3f7a5252765b4a9267efdbecb5cd Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 5 Nov 2025 13:48:19 -0600 Subject: [PATCH 2/4] Run tests for osg 25/el10 --- .github/workflows/tarball-build-test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tarball-build-test.yml b/.github/workflows/tarball-build-test.yml index 25980fb..b8e445e 100644 --- a/.github/workflows/tarball-build-test.yml +++ b/.github/workflows/tarball-build-test.yml @@ -8,8 +8,11 @@ jobs: strategy: matrix: OS_TYPE: ["almalinux"] - OS_VERSION: [8, 9] - OSG_VERSION: [3.6.123456, 23.123456] + OS_VERSION: [8, 9, 10] + OSG_VERSION: [24.123456, 25.123456] + exclude: + - OS_VERSION: 10 + OSG_VERSION: 24.123456 env: OS_TYPE: ${{ matrix.OS_TYPE }} OS_VERSION: ${{ matrix.OS_VERSION }} From 04a24fb168169e5fd1bdf5ddb60827d7c6c2dfa4 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 5 Nov 2025 13:49:36 -0600 Subject: [PATCH 3/4] Add almalinux10 to test matrix --- tests/setup_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/setup_tests.sh b/tests/setup_tests.sh index b676600..61f088e 100755 --- a/tests/setup_tests.sh +++ b/tests/setup_tests.sh @@ -5,6 +5,7 @@ image= case "${OS_TYPE}${OS_VERSION}" in almalinux8) image=almalinux:8 ;; almalinux9) image=almalinux:9 ;; + almalinux10) image=almalinux:10 ;; *) echo >&2 "${OS_TYPE}${OS_VERSION} not supported"; exit 1 ;; esac From 20ebd0ad7e61c1081ddb6b8aabafb778466641b2 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 5 Nov 2025 13:58:20 -0600 Subject: [PATCH 4/4] Remove el10 from build matrix --- .github/workflows/tarball-build-test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tarball-build-test.yml b/.github/workflows/tarball-build-test.yml index b8e445e..eb70b2f 100644 --- a/.github/workflows/tarball-build-test.yml +++ b/.github/workflows/tarball-build-test.yml @@ -8,11 +8,8 @@ jobs: strategy: matrix: OS_TYPE: ["almalinux"] - OS_VERSION: [8, 9, 10] + OS_VERSION: [8, 9] OSG_VERSION: [24.123456, 25.123456] - exclude: - - OS_VERSION: 10 - OSG_VERSION: 24.123456 env: OS_TYPE: ${{ matrix.OS_TYPE }} OS_VERSION: ${{ matrix.OS_VERSION }}