[client] ci: test libdecor build as part of matrix

We source libdecor packages from a PPA.
This commit is contained in:
Quantum 2021-07-21 21:50:37 -04:00 committed by Geoffrey McRae
parent 27e3be3778
commit 4b016b441c

View File

@ -8,13 +8,15 @@ jobs:
compiler: compiler:
- {cc: gcc, cxx: g++} - {cc: gcc, cxx: g++}
- {cc: clang, cxx: clang++} - {cc: clang, cxx: clang++}
build_type: wayland_shell: [xdg-shell, libdecor]
- Release build_type: [Release, Debug]
- Debug
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
submodules: recursive submodules: recursive
- name: Install libdecor PPA
run: sudo add-apt-repository ppa:christianrauch/libdecoration
if: ${{ matrix.wayland_shell == 'libdecor' }}
- name: Update apt - name: Update apt
run: | run: |
sudo apt-get update sudo apt-get update
@ -25,7 +27,8 @@ jobs:
libspice-protocol-dev nettle-dev \ libspice-protocol-dev nettle-dev \
libgl-dev libgles-dev \ libgl-dev libgles-dev \
libx11-dev libxss-dev libxi-dev libxinerama-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 - name: Configure client
env: env:
CC: /usr/bin/${{ matrix.compiler.cc }} CC: /usr/bin/${{ matrix.compiler.cc }}
@ -36,6 +39,7 @@ jobs:
cmake \ cmake \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DCMAKE_LINKER:FILEPATH=/usr/bin/ld \ -DCMAKE_LINKER:FILEPATH=/usr/bin/ld \
-DENABLE_LIBDECOR=${{ matrix.wayland_shell == 'libdecor' }} \
.. ..
- name: Build client - name: Build client
run: | run: |