diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-09-22 14:23:33 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-09-22 17:40:43 +0200 |
| commit | 8b14d0b545da1e65027b6f791b260cc9bb52b740 (patch) | |
| tree | b9b0e192a1de838eccb5ea8be74d623f480a2cb0 | |
| parent | 5daf9c2b01926bce719ae0b53d80c7c7595e5977 (diff) | |
| download | neard-8b14d0b545da1e65027b6f791b260cc9bb52b740.tar.gz | |
ci: add more Fedora containers
Build in Fedora rawhide and in stable release containers.
Rawhide fails to install packages in two rounds (with two dnf/yum
commands), so combine these. Rawhide also needs explicit pkg-config as
it is not pulled in by other packages.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rwxr-xr-x | ci/fedora.sh | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a4eeed..cc97767 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,11 @@ jobs: - alpine:latest - debian:testing - debian:stable + # Fails on configure on GCC and clang (process restrictions?) + # - fedora:rawhide - fedora:latest + - fedora:33 + - fedora:32 - ubuntu:hirsute - ubuntu:focal - ubuntu:bionic diff --git a/ci/fedora.sh b/ci/fedora.sh index f054f7d..f9ec67a 100755 --- a/ci/fedora.sh +++ b/ci/fedora.sh @@ -15,19 +15,22 @@ case $CC in ;; esac +# Packages needed by CI +PKGS_MORE="file" + +# diffutils: Rawhide/35 needs "cmp" for configure dnf -y install \ autoconf \ autoconf-archive \ automake \ dbus-devel \ + diffutils \ glib2-devel \ libnl3-devel \ libtool \ make \ - $PKGS_CC - -# Packages needed by CI -dnf -y install \ - file + pkg-config \ + $PKGS_CC \ + $PKGS_MORE echo "Install finished: $0" |