From 8e78d93ce9ddcfe1af4ec5e7fcb40ff22eea56a9 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Wed, 28 Aug 2024 09:48:05 -0600 Subject: [PATCH] CI: Build wayland 1.23 manually Without edge, latest only has 1.22 until possibly Nov '24, when alpine image 3.21 is released. --- .github/workflows/ci.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 54f57fcc5..fd18c91ce 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,12 @@ jobs: runs-on: ubuntu-latest container: alpine:latest steps: - - run: apk --no-cache add git gcc g++ binutils pkgconf meson ninja musl-dev wayland-dev wayland-protocols libinput-dev libevdev-dev libxkbcommon-dev pixman-dev glm-dev libdrm-dev mesa-dev cairo-dev pango-dev eudev-dev libxml2-dev libseat-dev libxcb-dev xcb-util-wm-dev xwayland doctest doctest-dev cmake libdisplay-info-dev hwdata-dev nlohmann-json + - run: apk --no-cache add git gcc g++ binutils pkgconf meson ninja musl-dev wayland-protocols libinput-dev libevdev-dev libxkbcommon-dev pixman-dev glm-dev libdrm-dev mesa-dev cairo-dev pango-dev eudev-dev libxml2-dev libseat-dev libxcb-dev xcb-util-wm-dev xwayland doctest doctest-dev cmake libdisplay-info-dev hwdata-dev nlohmann-json + - run: cd $GITHUB_WORKSPACE && git clone https://gitlab.freedesktop.org/wayland/wayland && cd wayland && git checkout 1.23.0 && meson setup build -Ddocumentation=false -Dtests=false --prefix=/usr && ninja -C build && ninja -C build install && cd .. + - run: git config --global --add safe.directory /__w/wayfire/wayfire + - run: git config --global --add safe.directory /__w/wayfire/wayfire/wayland + - run: git config --global --add safe.directory $GITHUB_WORKSPACE + - run: git config --global --add safe.directory $GITHUB_WORKSPACE/wayland - uses: actions/checkout@v1 - run: git config --global --add safe.directory /__w/wayfire/wayfire - run: git submodule sync --recursive && git submodule update --init --force --recursive