From 06c33cc3b08f5996ddd50a14d2787f04bce08a59 Mon Sep 17 00:00:00 2001 From: bi4k8 Date: Fri, 9 Dec 2022 17:28:40 +0000 Subject: [PATCH] ci: update for Wayland build --- .github/workflows/build-and-test-linux.yaml | 7 ++++++- .github/workflows/build-and-test-macos.yaml | 1 + .github/workflows/publish-appimage.yml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml index 80ab9385..cceab9c0 100644 --- a/.github/workflows/build-and-test-linux.yaml +++ b/.github/workflows/build-and-test-linux.yaml @@ -11,6 +11,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 x11: [ON, OFF] + wayland: [ON, OFF] compiler: - clang - gcc @@ -74,6 +75,8 @@ jobs: libpulse-dev \ librsvg2-dev \ libsystemd-dev \ + libwayland-bin \ + libwayland-dev \ libx11-dev \ libxdamage-dev \ libxext-dev \ @@ -82,7 +85,8 @@ jobs: libxml2-dev \ libxmmsclient-dev \ libxnvctrl-dev \ - ncurses-dev + ncurses-dev \ + wayland-protocols - name: Install libc++ if: matrix.compiler == 'clang' run: | @@ -125,6 +129,7 @@ jobs: -DBUILD_RSS=ON \ -DBUILD_TESTS=ON \ -DBUILD_WLAN=ON \ + -DBUILD_WAYLAND=${{ matrix.wayland }}\ -DBUILD_X11=${{ matrix.x11 }} \ -DBUILD_XMMS2=ON \ -DCMAKE_C_COMPILER=$CC \ diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml index f90f928a..933cbd67 100644 --- a/.github/workflows/build-and-test-macos.yaml +++ b/.github/workflows/build-and-test-macos.yaml @@ -32,6 +32,7 @@ jobs: cd build cmake .. \ -DMAINTAINER_MODE=ON \ + -DBUILD_WAYLAND=OFF \ -DBUILD_TESTS=ON - name: Compile working-directory: build diff --git a/.github/workflows/publish-appimage.yml b/.github/workflows/publish-appimage.yml index b4371c99..d3606189 100644 --- a/.github/workflows/publish-appimage.yml +++ b/.github/workflows/publish-appimage.yml @@ -41,6 +41,7 @@ jobs: libpulse-dev \ librsvg2-dev \ libsystemd-dev \ + libwayland-dev \ libx11-dev \ libxdamage-dev \ libxext-dev \