From 8ddfcb80e51d2a85fcd535362011367c70949308 Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:49:01 +0200 Subject: [PATCH] CI: switch Arch and FreeBSD to wlroots 0.18 Also add wlroots0.18-devel to Void, assuming that is what the package will be called once available. For previous packaging see https://github.com/void-linux/void-packages/pull/48323/files --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78912600..88f83f52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,6 @@ jobs: container: archlinux:base-devel env: TARGET: 'sh -xe' - PKG_CONFIG_PATH: '/usr/lib/wlroots0.17/pkgconfig' - name: Debian os: ubuntu-latest @@ -70,7 +69,7 @@ jobs: run: | pacman-key --init pacman -Syu --noconfirm - pacman -S --noconfirm git meson clang wlroots0.17 libdrm libinput \ + pacman -S --noconfirm git meson clang wlroots libdrm libinput \ wayland-protocols cairo pango libxml2 xorg-xwayland librsvg \ libdisplay-info @@ -92,7 +91,7 @@ jobs: sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf pkg set -yn pkg:mesa-dri # hack to skip llvm dependency pkg install -y git meson gcc pkgconf cairo pango evdev-proto \ - hwdata wayland-protocols wlroots017 libdisplay-info + hwdata wayland-protocols wlroots libdisplay-info run: echo "setup done" - name: Install Void Linux dependencies @@ -106,7 +105,7 @@ jobs: xbps-install -Syu xbps-install -y git meson gcc clang pkg-config scdoc \ cairo-devel glib-devel libpng-devel librsvg-devel libxml2-devel \ - pango-devel wlroots0.17-devel gdb bash xorg-server-xwayland \ + pango-devel wlroots0.18-devel gdb bash xorg-server-xwayland \ dejavu-fonts-ttf # These build are executed on all runners -- 2.52.0