From: Kirill Isakov Date: Sat, 21 May 2022 11:55:28 +0000 (+0600) Subject: CI: remove OpenSSL 3 from Fedora; add RHEL 9 & Alpine Edge X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;ds=sidebyside;h=d7408492415b8c6eb50de44d2dd74b93b0b3e902;p=tinc CI: remove OpenSSL 3 from Fedora; add RHEL 9 & Alpine Edge --- diff --git a/.ci/deps.sh b/.ci/deps.sh index c33016ad..67e1e0b9 100755 --- a/.ci/deps.sh +++ b/.ci/deps.sh @@ -79,7 +79,8 @@ deps_linux_rhel() { if type dnf; then dnf install -y 'dnf-command(config-manager)' - dnf config-manager --enable powertools + dnf config-manager --enable powertools || true + dnf config-manager --enable crb || true fi fi @@ -140,9 +141,16 @@ deps_linux() { deps_linux_debian "$@" ;; - centos | almalinux | fedora) + fedora) deps_linux_rhel "$@" - linux_openssl3 + ;; + + centos | almalinux) + deps_linux_rhel "$@" + + if [ "${PLATFORM_ID:-}" != platform:el9 ]; then + linux_openssl3 + fi ;; *) exit 1 ;; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ec70fa50..87a758f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -150,8 +150,10 @@ jobs: matrix: os: - alpine + - alpine:edge - centos:7 # aka RHEL 7 - almalinux:8 # aka RHEL 8 + - almalinux:9 # aka RHEL 9 - fedora - debian:buster - debian:bullseye