All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: linux-nfc@lists.01.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Subject: [linux-nfc] [neard][PATCH 4/8] ci: add more Fedora containers
Date: Wed, 22 Sep 2021 18:11:09 +0200	[thread overview]
Message-ID: <20210922161113.142758-4-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210922161113.142758-1-krzysztof.kozlowski@canonical.com>

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>
---
 .github/workflows/ci.yml |  4 ++++
 ci/fedora.sh             | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a4eeedf3d66..cc977670e380 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 f054f7d296d4..f9ec67a15062 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"
-- 
2.30.2
_______________________________________________
Linux-nfc mailing list -- linux-nfc@lists.01.org
To unsubscribe send an email to linux-nfc-leave@lists.01.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: linux-nfc@lists.01.org
Subject: [neard][PATCH 4/8] ci: add more Fedora containers
Date: Wed, 22 Sep 2021 18:11:09 +0200	[thread overview]
Message-ID: <20210922161113.142758-4-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210922161113.142758-1-krzysztof.kozlowski@canonical.com>

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

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>
---
 .github/workflows/ci.yml |  4 ++++
 ci/fedora.sh             | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a4eeedf3d66..cc977670e380 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 f054f7d296d4..f9ec67a15062 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"
-- 
2.30.2

  parent reply	other threads:[~2021-09-22 16:12 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-22 16:11 [linux-nfc] [neard][PATCH 1/8] build: adjust configure.ac syntax to match autoupdate Krzysztof Kozlowski
2021-09-22 16:11 ` Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 2/8] build: replace deprecated AC_HELP_STRING Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 3/8] ci: switch to dnf on Fedora Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-22 16:11 ` Krzysztof Kozlowski [this message]
2021-09-22 16:11   ` [neard][PATCH 4/8] ci: add more Fedora containers Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 5/8] ci: add ArchLinux container Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 6/8] ci: install pkg-config Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 7/8] HACKING: rephrase message about dependencies Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-22 16:11 ` [linux-nfc] [neard][PATCH 8/8] ci: group package installation on Alpine Krzysztof Kozlowski
2021-09-22 16:11   ` Krzysztof Kozlowski
2021-09-23 15:54 ` [linux-nfc] Re: [neard][PATCH 1/8] build: adjust configure.ac syntax to match autoupdate Krzysztof Kozlowski
2021-09-23 15:54   ` Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210922161113.142758-4-krzysztof.kozlowski@canonical.com \
    --to=krzysztof.kozlowski@canonical.com \
    --cc=linux-nfc@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.