diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5c36b91..adcb171d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,6 @@ jobs: name: Build Wayland libraries runs-on: ubuntu-24.04 env: - xwayland-version: "22.1.9" wayland-version: "1.22.0" wayland-protocols-version: "1.32" strategy: @@ -51,6 +50,7 @@ jobs: seatd \ xfonts-utils \ xserver-xorg-dev \ + xwayland \ ninja-build - name: Set environment variables run: | @@ -66,12 +66,10 @@ jobs: wget -O wlroots.tar.gz $WLROOTS_URL tar -xJf wayland-${{ env.wayland-version }}.tar.xz tar -xJf wayland-protocols-${{ env.wayland-protocols-version }}.tar.xz - tar -xzf xserver-xwayland-${{ env.xwayland-version }}.tar.gz tar -xzf wlroots.tar.gz env: WAYLAND_URL: https://gitlab.freedesktop.org/wayland/wayland/-/releases/${{ env.wayland-version }}/downloads/wayland-${{ env.wayland-version }}.tar.xz WAYLAND_PROTOCOLS_URL: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${{ env.wayland-protocols-version }}/downloads/wayland-protocols-${{ env.wayland-protocols-version }}.tar.xz - XWAYLAND_URL: https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${{ env.xwayland-version }}/xserver-xwayland-${{ env.xwayland-version }}.tar.gz WLROOTS_URL: https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${{ matrix.wlroots-version }}/wlroots-${{ matrix.wlroots-version }}.tar.gz - name: Build wayland working-directory: wayland-${{ env.wayland-version }} @@ -87,13 +85,6 @@ jobs: ninja -C build DESTDIR=~/wayland ninja -C build install sudo ninja -C build install - - name: Build xwayland - working-directory: xserver-xwayland-${{ env.xwayland-version }} - run: | - meson build --prefix=/usr - ninja -C build - DESTDIR=~/wayland ninja -C build install - sudo ninja -C build install - name: Build wlroots working-directory: wlroots-${{ matrix.wlroots-version }} continue-on-error: ${{ matrix.wlroots-version == 'master' }}