From 4b016b441c1ba3e3f441c3765d10b0f2cb9c645f Mon Sep 17 00:00:00 2001 From: Quantum Date: Wed, 21 Jul 2021 21:50:37 -0400 Subject: [PATCH] [client] ci: test libdecor build as part of matrix We source libdecor packages from a PPA. --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d993d4b3..945390db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,13 +8,15 @@ jobs: compiler: - {cc: gcc, cxx: g++} - {cc: clang, cxx: clang++} - build_type: - - Release - - Debug + wayland_shell: [xdg-shell, libdecor] + build_type: [Release, Debug] steps: - uses: actions/checkout@v1 with: submodules: recursive + - name: Install libdecor PPA + run: sudo add-apt-repository ppa:christianrauch/libdecoration + if: ${{ matrix.wayland_shell == 'libdecor' }} - name: Update apt run: | sudo apt-get update @@ -25,7 +27,8 @@ jobs: libspice-protocol-dev nettle-dev \ libgl-dev libgles-dev \ libx11-dev libxss-dev libxi-dev libxinerama-dev \ - libwayland-dev wayland-protocols + libwayland-dev wayland-protocols \ + $([ '${{ matrix.wayland_shell }}' = libdecor ] && echo 'libdecor-dev libdbus-1-dev') - name: Configure client env: CC: /usr/bin/${{ matrix.compiler.cc }} @@ -36,6 +39,7 @@ jobs: cmake \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ -DCMAKE_LINKER:FILEPATH=/usr/bin/ld \ + -DENABLE_LIBDECOR=${{ matrix.wayland_shell == 'libdecor' }} \ .. - name: Build client run: |