From 3ab9991c70e6d7bcf2e38e527454600662de1420 Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 2 Aug 2023 12:18:33 +0200 Subject: [PATCH 1/2] iwyu.yml: actually disable archlinux step [skip ci] --- .github/workflows/iwyu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index f920b0ece67..04f31c8b4d7 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -29,12 +29,13 @@ jobs: ln -s ../x86_64-linux-gnu/qt5 /usr/include/qt - name: Install missing software on archlinux + if: false run: | set -x pacman -Sy pacman -S cmake make gcc qt5-base qt5-tools qt5-charts pcre wget --noconfirm pacman-key --init - pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com + pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com pacman-key --lsign-key 3056513887B78AEB pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' --noconfirm echo "[chaotic-aur]" >> /etc/pacman.conf From 4c7f0b57e02f34f2d5a176e52536f0a2db341d45 Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 2 Aug 2023 12:22:45 +0200 Subject: [PATCH 2/2] iwyu.yml: conditionally disable steps based on image [skip ci] --- .github/workflows/iwyu.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 04f31c8b4d7..1daa54ce203 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -10,6 +10,10 @@ permissions: jobs: iwyu: + strategy: + matrix: + image: ["fedora:latest"] # "debian:unstable" / "archlinux:latest" + runs-on: ubuntu-22.04 container: @@ -20,7 +24,7 @@ jobs: # TODO: the necessary packages are excessive - mostly because of Qt - use a pre-built image - name: Install missing software on debian/ubuntu - if: false + if: contains(matrix.image, 'debian') run: | apt-get update apt-get install -y cmake g++ make libpcre3-dev @@ -29,7 +33,7 @@ jobs: ln -s ../x86_64-linux-gnu/qt5 /usr/include/qt - name: Install missing software on archlinux - if: false + if: contains(matrix.image, 'archlinux') run: | set -x pacman -Sy @@ -46,6 +50,7 @@ jobs: # TODO: the necessary packages are excessive - mostly because of Qt - use a pre-built image - name: Install missing software on Fedora + if: contains(matrix.image, 'fedora') run: | dnf install -y cmake gcc-c++ qt5-qtbase-devel qt5-linguist qt5-qttools-devel qt5-qtcharts-devel pcre-devel dnf install -y wget iwyu