CI: add libseccomp to Linux jobs

Also add alpine:edge and RHEL 9
gsliepen · May 15, 2022 · fdfe05c · fdfe05c
1 parent c32235a
commit fdfe05c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.ci/deps.sh b/.ci/deps.sh
@@ -7,7 +7,7 @@ deps_linux_alpine() {
 
   apk add \
     git binutils meson pkgconf gcc linux-headers shadow sudo libgcrypt-dev texinfo gzip \
-    openssl-dev zlib-dev lzo-dev ncurses-dev readline-dev musl-dev lz4-dev vde2-dev cmocka-dev
+    openssl-dev zlib-dev lzo-dev ncurses-dev readline-dev musl-dev lz4-dev vde2-dev cmocka-dev libseccomp-dev
 }
 
 deps_linux_debian_mingw() {
@@ -42,6 +42,7 @@ deps_linux_debian_linux() {
   if [ -n "$HOST" ]; then
     apt-get install -y crossbuild-essential-"$HOST" qemu-user
   else
+    apt-get install -y libseccomp-dev
     linux_openssl3
   fi
 }
@@ -79,15 +80,17 @@ 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
 
   yum upgrade -y
 
   yum install -y \
     git binutils make meson pkgconf gcc sudo texinfo-tex systemd perl-IPC-Cmd \
-    lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel libgcrypt-devel "$@"
+    lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel libgcrypt-devel libseccomp-devel \
+    "$@"
 
   if yum info openssl11-devel; then
     yum install -y openssl11-devel
@@ -140,9 +143,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
@@ -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