From 468574c2941667b3675a0d216bd7ddefabdab9b7 Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 20 Jan 2022 18:45:45 +0100
Subject: [PATCH 1/4] Also enabled builds on RockyLinux 8

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

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 22a1ea9fe..6349574d4 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ['centos:centos7']
+        image: ['centos:centos7', 'rockylinux:8']
         components: ['udt,myproxy,ssh', 'gram5']
     steps:
       - uses: actions/checkout@v2

From 5a106e0532958a6d2435f91cf068bea10c714ca7 Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 20 Jan 2022 19:02:43 +0100
Subject: [PATCH 2/4] Adapt Travis-CI scripts (used by for GHA, too)
 accordingly

---
 travis-ci/run_task_inside_docker.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh
index 714a80a30..aa497e6db 100755
--- a/travis-ci/run_task_inside_docker.sh
+++ b/travis-ci/run_task_inside_docker.sh
@@ -11,6 +11,7 @@ set -e
 case $(</etc/redhat-release) in
     CentOS*\ 6*) OS=centos6 ;;
     CentOS*\ 7*) OS=centos7 ;;
+    Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
     Fedora*\ 26*) OS=fedora26 ;;
     Fedora*\ 27*) OS=fedora27 ;;
     *) OS=unknown ;;
@@ -22,6 +23,9 @@ case $OS in
               ;;
     centos7)  yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
               ;;
+    rockylinux8)
+              yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+              ;;
 esac
 
 # Clean the yum cache

From e5e79cbd8d11ecb195ce89677794daaa883d16ae Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 20 Jan 2022 19:27:12 +0100
Subject: [PATCH 3/4] PowerTools repo needs to be enabled for specific
 dependencies, e.g.:

* libedit-devel
* libnice-devel
---
 .github/workflows/build-test-deploy.yml |  2 ++
 travis-ci/run_task_inside_docker.sh     | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 6349574d4..09857103d 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -16,6 +16,8 @@ jobs:
         components: ['udt,myproxy,ssh', 'gram5']
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
     
       - name: build/test on ${{ matrix.image }} with ${{ matrix.components }}
         env:
diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh
index aa497e6db..38c6f3dc9 100755
--- a/travis-ci/run_task_inside_docker.sh
+++ b/travis-ci/run_task_inside_docker.sh
@@ -12,8 +12,6 @@ case $(</etc/redhat-release) in
     CentOS*\ 6*) OS=centos6 ;;
     CentOS*\ 7*) OS=centos7 ;;
     Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
-    Fedora*\ 26*) OS=fedora26 ;;
-    Fedora*\ 27*) OS=fedora27 ;;
     *) OS=unknown ;;
 esac
 
@@ -25,6 +23,8 @@ case $OS in
               ;;
     rockylinux8)
               yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+              dnf -y install dnf-plugins-core
+              dnf config-manager --set-enabled powertools
               ;;
 esac
 
@@ -37,6 +37,12 @@ packages=(gcc gcc-c++ make autoconf automake libtool \
           'perl(URI)' file sudo bison patch curl \
           pam pam-devel libedit libedit-devel)
 
+if [[ $OS == rockylinux8 ]]; then
+
+    # provides `cmp` used by `packaging/git-dirt-filter`
+    packages+=(diffutils)
+fi
+
 if [[ $TASK == tests ]]; then
     set +e
     [[ $COMPONENTS == *udt* ]]     && packages+=(udt-devel libnice-devel)

From 166cda9407f250767b34e86dfa3e0b9cf8891c17 Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 3 Feb 2022 18:59:18 +0100
Subject: [PATCH 4/4] Also try builds on CentOS Stream 8 and 9

---
 .github/workflows/build-test-deploy.yml | 17 +++++++--
 travis-ci/run_task_inside_docker.sh     | 46 ++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 09857103d..c76cbbd12 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -12,8 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ['centos:centos7', 'rockylinux:8']
+        image: ['centos:centos7', 'rockylinux:8', 'quay.io/centos/centos:stream8']
         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'
     steps:
       - uses: actions/checkout@v2
         with:
@@ -27,6 +33,10 @@ jobs:
         run: travis-ci/setup_tasks.sh
         
       - name: build source tarballs and srpms
+        # Only run this step for the centos:centos7 case and for only one component selection
+        if: |
+          contains(matrix.image , 'centos:centos7') &&
+          contains(matrix.components , 'udt,myproxy,ssh')
         env:
           IMAGE: centos:centos7
           TASK: srpms
@@ -34,7 +44,10 @@ jobs:
       
       # SSH key recipe from https://www.webfactory.de/blog/use-ssh-key-for-private-repositories-in-github-actions
       - name: Establish ssh and upload source tarballs
-        if: contains(github.ref , 'refs/tags/')
+        # Only run this step for the centos:centos7 case
+        if: |
+          contains(matrix.image , 'centos:centos7') &&
+          contains(github.ref , 'refs/tags/')
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh
index 38c6f3dc9..b573807ca 100755
--- a/travis-ci/run_task_inside_docker.sh
+++ b/travis-ci/run_task_inside_docker.sh
@@ -9,22 +9,34 @@ COMPONENTS=${3-}
 set -e
 
 case $(</etc/redhat-release) in
-    CentOS*\ 6*) OS=centos6 ;;
     CentOS*\ 7*) OS=centos7 ;;
+    CentOS\ Stream*\ 8*) OS=centos-stream-8;;
+    CentOS\ Stream*\ 9*) OS=centos-stream-9;;
     Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
     *) OS=unknown ;;
 esac
 
 # EPEL required for UDT
 case $OS in
-    centos6)  yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
-              ;;
-    centos7)  yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+    # from `https://docs.fedoraproject.org/en-US/epel/#_quickstart`
+    centos7)  yum -y install epel-release
               ;;
     rockylinux8)
-              yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
               dnf -y install dnf-plugins-core
               dnf config-manager --set-enabled powertools
+              dnf -y install epel-release
+              ;;
+    centos-stream-8)
+              dnf -y install dnf-plugins-core
+              dnf config-manager --set-enabled powertools
+              dnf -y install epel-release epel-next-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
               ;;
 esac
 
@@ -35,12 +47,25 @@ packages=(gcc gcc-c++ make autoconf automake libtool \
           libtool-ltdl-devel openssl openssl-devel git \
           'perl(Test)' 'perl(Test::More)' 'perl(File::Spec)' \
           'perl(URI)' file sudo bison patch curl \
-          pam pam-devel libedit libedit-devel)
+          pam pam-devel libedit libedit-devel )
 
-if [[ $OS == rockylinux8 ]]; then
+if [[ $OS != centos7 ]]; then
 
     # provides `cmp` used by `packaging/git-dirt-filter`
     packages+=(diffutils)
+    if [[ $OS == centos-stream-9 ]]; then
+
+        # also install "zlib zlib-devel" because it's needed for `configure`ing
+        # "gridftp/server/src"
+        packages+=(zlib zlib-devel)
+        # "perl-English" isn't installed by default, so install it explicitly,
+        # because needed for "gridmap-tools-test.pl"
+        packages+=(perl-English)
+        # "perl-Sys-Hostname" isn't installed by default, so install it explicitly,
+        # because needed for globus_ftp_client test scripta.
+        # see https://github.com/fscheiner/gct/runs/5144915195?check_suite_focus=true#step:3:15649
+        packages+=(perl-Sys-Hostname)
+    fi
 fi
 
 if [[ $TASK == tests ]]; then
@@ -71,8 +96,11 @@ elif [[ $TASK == *rpms ]]; then
     packages+=(pam libedit libedit-devel)
 fi
 
-
-yum -y -d1 install "${packages[@]}"
+if [[ $OS == centos7 ]]; then
+	yum -y -d1 install "${packages[@]}"
+else
+	dnf --allowerasing -y -d1 install "${packages[@]}"
+fi
 
 # UID of travis user inside needs to match UID of travis user outside
 getent passwd travis > /dev/null || useradd travis -u $TRAVISUID -o