1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-29 18:18:39 +00:00

ci: update for Wayland build

This commit is contained in:
bi4k8 2022-12-09 17:28:40 +00:00 committed by Brenden Matthews
parent 6b0c194515
commit 06c33cc3b0
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
3 changed files with 8 additions and 1 deletions

View File

@ -11,6 +11,7 @@ jobs:
- ubuntu-20.04 - ubuntu-20.04
- ubuntu-22.04 - ubuntu-22.04
x11: [ON, OFF] x11: [ON, OFF]
wayland: [ON, OFF]
compiler: compiler:
- clang - clang
- gcc - gcc
@ -74,6 +75,8 @@ jobs:
libpulse-dev \ libpulse-dev \
librsvg2-dev \ librsvg2-dev \
libsystemd-dev \ libsystemd-dev \
libwayland-bin \
libwayland-dev \
libx11-dev \ libx11-dev \
libxdamage-dev \ libxdamage-dev \
libxext-dev \ libxext-dev \
@ -82,7 +85,8 @@ jobs:
libxml2-dev \ libxml2-dev \
libxmmsclient-dev \ libxmmsclient-dev \
libxnvctrl-dev \ libxnvctrl-dev \
ncurses-dev ncurses-dev \
wayland-protocols
- name: Install libc++ - name: Install libc++
if: matrix.compiler == 'clang' if: matrix.compiler == 'clang'
run: | run: |
@ -125,6 +129,7 @@ jobs:
-DBUILD_RSS=ON \ -DBUILD_RSS=ON \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
-DBUILD_WLAN=ON \ -DBUILD_WLAN=ON \
-DBUILD_WAYLAND=${{ matrix.wayland }}\
-DBUILD_X11=${{ matrix.x11 }} \ -DBUILD_X11=${{ matrix.x11 }} \
-DBUILD_XMMS2=ON \ -DBUILD_XMMS2=ON \
-DCMAKE_C_COMPILER=$CC \ -DCMAKE_C_COMPILER=$CC \

View File

@ -32,6 +32,7 @@ jobs:
cd build cd build
cmake .. \ cmake .. \
-DMAINTAINER_MODE=ON \ -DMAINTAINER_MODE=ON \
-DBUILD_WAYLAND=OFF \
-DBUILD_TESTS=ON -DBUILD_TESTS=ON
- name: Compile - name: Compile
working-directory: build working-directory: build

View File

@ -41,6 +41,7 @@ jobs:
libpulse-dev \ libpulse-dev \
librsvg2-dev \ librsvg2-dev \
libsystemd-dev \ libsystemd-dev \
libwayland-dev \
libx11-dev \ libx11-dev \
libxdamage-dev \ libxdamage-dev \
libxext-dev \ libxext-dev \