mirror of
https://github.com/cage-kiosk/cage.git
synced 2025-11-27 06:59:54 -05:00
build: drop xwayland option
This is unnecessary because Xwayland logic doesn't bring in new dependencies. We can just compile in our Xwayland-related code when wlroots has been built with Xwayland support. See this Sway patch: https://github.com/swaywm/sway/pull/8165
This commit is contained in:
parent
e7d8780f46
commit
d3fb99d665
4 changed files with 7 additions and 18 deletions
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
# TODO: use --fatal-meson-warnings when on wlroots 0.15.0
|
||||
- name: Compile Cage (XWayland=${{ matrix.xwayland }})
|
||||
run: |
|
||||
meson build-${{ matrix.CC }}-${{matrix.xwayland }} -Dxwayland=${{ matrix.xwayland }}
|
||||
meson build-${{ matrix.CC }}-${{matrix.xwayland }} -Dwlroots:xwayland=${{ matrix.xwayland }}
|
||||
ninja -C build-${{ matrix.CC }}-${{matrix.xwayland }}
|
||||
|
||||
format:
|
||||
|
|
@ -54,7 +54,7 @@ jobs:
|
|||
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17
|
||||
- name: Check for formatting changes
|
||||
run: |
|
||||
meson build-clang-format -Dxwayland=enabled
|
||||
meson build-clang-format -Dwlroots:xwayland=enabled
|
||||
ninja -C build-clang-format clang-format-check
|
||||
|
||||
scan-build:
|
||||
|
|
@ -73,5 +73,5 @@ jobs:
|
|||
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17
|
||||
- name: Run scan-build
|
||||
run: |
|
||||
meson build-scan-build -Dxwayland=enabled
|
||||
meson build-scan-build -Dwlroots:xwayland=enabled
|
||||
ninja -C build-scan-build scan-build
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue