Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,8 @@ jobs:
# Don't cancel the remaining running jobs if some job(s) fail(s)
fail-fast: false
matrix:
image: ['centos:centos7', 'rockylinux:8', 'quay.io/centos/centos:stream8']
image: ['centos:centos7', 'rockylinux:8', 'rockylinux:9', 'quay.io/centos/centos:stream8', 'quay.io/centos/centos:stream9' ]
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: 'rockylinux:9'
components: 'myproxy,ssh'
- image: 'rockylinux:9'
components: 'gram5'
steps:
- uses: actions/checkout@v2
with:
Expand Down
9 changes: 1 addition & 8 deletions travis-ci/make_rpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,7 @@ EOF
# Limit package list according to OS possibilities
all_packages=( $(grep -v '^#' $fedoradir/ORDERING | grep '[^[:space:]]') )

if [[ $OS != *9 ]]; then

packages=( ${all_packages[@]} )
else
# Not building globus-xio-udt-driver on *9
packages_9=( ${all_packages[@]/globus-xio-udt-driver/} )
packages=( ${packages_9[@]} )
fi
packages=( ${all_packages[@]} )

cp -f "$tarballdir"/*.tar.gz "$topdir"/SOURCES

Expand Down
10 changes: 1 addition & 9 deletions travis-ci/run_task_inside_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,7 @@ elif [[ $TASK == *rpms ]]; then
# for globus-gridftp-server:
packages+=(fakeroot)
# for globus-xio-udt-driver:
if [[ $OS == *9 ]]; then

# libnice-devel is not available for CentOS Stream 9 / Rocky Linux 9.
#
# make_rpms.sh was also updated in this regard.
:
else
packages+=(udt udt-devel glib2-devel libnice-devel gettext-devel libffi-devel)
fi
packages+=(udt udt-devel glib2-devel libnice-devel gettext-devel libffi-devel)
# for globus-gram-job-manager:
packages+=(libxml2-devel)
# for myproxy:
Expand Down