Merge pull request gridcf#241 from fscheiner/[...]: CI improvements

fscheiner · web-flow · commit 9e70bcf360c1 · 2025-11-18T14:02:41.000+01:00
## Enable CI builds for *10 distros and also on arm64 runners ##
* Enable CI builds for CentOS Stream/Rocky Linux 10
* Drop --with-ssl-engine from GSI-OpenSSH's configure(.gnu) line
* Enable builds on arm64 runners in addition
diff --git a/.github/workflows/build-test-deploy-arm64.yml b/.github/workflows/build-test-deploy-arm64.yml
@@ -0,0 +1,59 @@
+name: Build/Test/Deploy arm64
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.[0-9]+.[0-9]+
+  pull_request:
+
+jobs:
+  run-scripts:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      # Don't cancel the remaining running jobs if some job(s) fail(s)
+      fail-fast: false
+      matrix:
+        image: ['rockylinux:8']
+        components: ['udt,myproxy,ssh', 'gram5']
+        # Ignore UDT for the CentOS Stream 9 case because libnice is not available there yet
+        include:
+          - image: 'quay.io/centos/centos:stream9'
+            components: 'myproxy,ssh'
+          - image: 'quay.io/centos/centos:stream9'
+            components: 'gram5'
+          - image: 'quay.io/centos/centos:stream10'
+            components: 'myproxy,ssh'
+          - image: 'quay.io/centos/centos:stream10'
+            components: 'gram5'
+          - image: 'rockylinux:9'
+            components: 'myproxy,ssh'
+          - image: 'rockylinux:9'
+            components: 'gram5'
+          - image: 'rockylinux/rockylinux:10'
+            components: 'myproxy,ssh'
+          - image: 'rockylinux/rockylinux:10'
+            components: 'gram5'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: build/test on ${{ matrix.image }} with ${{ matrix.components }}
+        env:
+          IMAGE: ${{ matrix.image }}
+          TASK: tests
+          COMPONENTS: ${{ matrix.components }}
+        run: travis-ci/setup_tasks.sh
+
+      - name: build source tarballs and srpms
+        # Run this step for all OS cases but for only one component selection each,
+        # it still builds **all** source tarballs and SRPMs
+        if: |
+          contains(matrix.components , 'gram5')
+        env:
+          IMAGE: ${{ matrix.image }}
+          TASK: srpms
+        run: travis-ci/setup_tasks.sh
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -8,7 +8,7 @@ on:
       - v[0-9]+.[0-9]+.[0-9]+
       - v[0-9]+.[0-9]+.[0-9]+.[0-9]+
   pull_request:
-      
+
 jobs:
   run-scripts:
     runs-on: ubuntu-latest
@@ -24,20 +24,28 @@ jobs:
             components: 'myproxy,ssh'
           - image: 'quay.io/centos/centos:stream9'
             components: 'gram5'
+          - image: 'quay.io/centos/centos:stream10'
+            components: 'myproxy,ssh'
+          - image: 'quay.io/centos/centos:stream10'
+            components: 'gram5'
           - image: 'rockylinux:9'
             components: 'myproxy,ssh'
           - image: 'rockylinux:9'
             components: 'gram5'
+          - image: 'rockylinux/rockylinux:10'
+            components: 'myproxy,ssh'
+          - image: 'rockylinux/rockylinux:10'
+            components: 'gram5'
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-    
+
       - name: build/test on ${{ matrix.image }} with ${{ matrix.components }}
         env:
-          IMAGE: ${{ matrix.image }} 
+          IMAGE: ${{ matrix.image }}
           TASK: tests
-          COMPONENTS: ${{ matrix.components }} 
+          COMPONENTS: ${{ matrix.components }}
         run: travis-ci/setup_tasks.sh
         
       - name: build source tarballs and srpms
diff --git a/gsi_openssh/source/configure.gnu b/gsi_openssh/source/configure.gnu
@@ -1,2 +1,2 @@
 #! /bin/sh
-"${0%.gnu}" "$@" --without-zlib-version-check --with-ssl-engine --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh"
+"${0%.gnu}" "$@" --without-zlib-version-check --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh"
diff --git a/travis-ci/make_source_tarballs.sh b/travis-ci/make_source_tarballs.sh
@@ -12,8 +12,10 @@ set -eu
 
 case $(</etc/redhat-release) in
     CentOS\ Stream*\ 9*) OS=centos-stream-9;;
+    CentOS\ Stream*\ 10*) OS=centos-stream-10;;
     Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
     Rocky\ Linux*\ 9*) OS=rockylinux9 ;;
+    Rocky\ Linux*\ 10*) OS=rockylinux10 ;;
     *) OS=unknown ;;
 esac
 
diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh
@@ -16,6 +16,12 @@ case $(</etc/redhat-release) in
         release_ver=el9
         ;;
 
+    CentOS\ Stream*\ 10*)
+
+        OS=centos-stream-10
+        release_ver=el10
+        ;;
+
     Rocky\ Linux*\ 8*)
 
         OS=rockylinux8
@@ -28,6 +34,12 @@ case $(</etc/redhat-release) in
         release_ver=el9
         ;;
 
+    Rocky\ Linux*\ 10*)
+
+        OS=rockylinux10
+        release_ver=el10
+        ;;
+
     *) OS=unknown ;;
 esac
 
@@ -44,12 +56,24 @@ case $OS in
               dnf config-manager --set-enabled crb
               dnf -y install epel-release
               ;;
+    rockylinux10)
+              dnf -y install dnf-plugins-core
+              dnf config-manager --set-enabled crb
+              dnf -y install epel-release
+              ;;
     centos-stream-9)
               dnf -y install dnf-plugins-core
               dnf config-manager --set-enabled crb
               dnf -y install \
                 https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
                 https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm
+              ;;
+    centos-stream-10)
+              dnf -y install dnf-plugins-core
+              dnf config-manager --set-enabled crb
+              dnf -y install \
+                https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
+              ;;
 esac
 
 # Clean the yum cache
@@ -63,7 +87,7 @@ packages=(gcc gcc-c++ make autoconf automake libtool \
 
 # provides `cmp` used by `packaging/git-dirt-filter`
 packages+=(diffutils)
-if [[ $OS == *9 ]]; then
+if [[ $OS == *9 || $OS == *10 ]]; then
 
 	# also install "zlib zlib-devel" because it's needed for `configure`ing
 	# "gridftp/server/src"
@@ -105,7 +129,7 @@ elif [[ $TASK == *rpms ]]; then
     # for globus-gram-audit:
     packages+=('perl(DBI)')
     # for globus-scheduler-event-generator:
-    if [[ $OS == *9 ]]; then
+    if [[ $OS == *9 || $OS == *10 ]]; then
 
         # redhat-lsb-core is not available for CentOS Stream 9 / Rocky Linux 9.
         # But the default is also to not use LSB, so can be ignored.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-"${0%.gnu}" "$@" --without-zlib-version-check --with-ssl-engine --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh"`
	`2`	`+"${0%.gnu}" "$@" --without-zlib-version-check --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh"`