Skip to content

Commit

Permalink
Merge branch 'danmar:main' into chr_Fix11842
Browse files Browse the repository at this point in the history
  • Loading branch information
chrchr-github authored Aug 2, 2023
2 parents dc8eba9 + da6c39e commit d7b238a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/iwyu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ permissions:
jobs:
iwyu:

strategy:
matrix:
image: ["fedora:latest"] # "debian:unstable" / "archlinux:latest"

runs-on: ubuntu-22.04

container:
Expand All @@ -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
Expand All @@ -29,12 +33,13 @@ jobs:
ln -s ../x86_64-linux-gnu/qt5 /usr/include/qt
- name: Install missing software on archlinux
if: contains(matrix.image, 'archlinux')
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
Expand All @@ -45,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
Expand Down

0 comments on commit d7b238a

Please sign in to comment.