diff options
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/build-test.yaml | 5 | ||||
| -rwxr-xr-x | tests/build.sh | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fad46b9..1bea24e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,8 +3,7 @@ test_task: matrix: image: registry.fedoraproject.org/fedora:latest image: quay.io/centos/centos:stream9 - image: quay.io/centos/centos:stream8 - image: centos:centos7 + image: docker.io/almalinux:8 build_script: tests/build.sh config_script: tests/config.sh run_httpd_background_script: /usr/sbin/httpd -DFOREGROUND diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 9d3335c..b811c7e 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -18,10 +18,9 @@ jobs: - 'registry.fedoraproject.org/fedora:rawhide' - 'registry.fedoraproject.org/fedora:latest' - 'quay.io/centos/centos:stream9' - - 'quay.io/centos/centos:stream8' - - 'quay.io/centos/centos:centos7' + - 'docker.io/almalinux:8' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set the right OS in the Dockerfile run: sed -i "s#^FROM.*#FROM ${{ matrix.os }}#" tests/Dockerfile - name: Build image diff --git a/tests/build.sh b/tests/build.sh index fa3d28d..ab399d0 100755 --- a/tests/build.sh +++ b/tests/build.sh @@ -3,13 +3,16 @@ set -e set -x -DNF=yum -BUILDDEP_PROVIDER=yum-utils -BUILDDEP=yum-builddep -if type dnf 2> /dev/null ; then +if type dnf5 2> /dev/null ; then + DNF=dnf + BUILDDEP_PROVIDER='dnf5-command(builddep)' + BUILDDEP='dnf builddep' +elif type dnf 2> /dev/null ; then DNF=dnf BUILDDEP_PROVIDER='dnf-command(builddep)' BUILDDEP='dnf builddep' +else + exit 1 fi $DNF install -y rpm-build "$BUILDDEP_PROVIDER" |