From 86315b178187ae75733f7e8d812089ad2d199d0b Mon Sep 17 00:00:00 2001 From: Jeroen Wijenbergh Date: Sun, 5 May 2024 23:54:35 +0200 Subject: [PATCH] green :) --- .github/workflows/ci.yml | 3 --- .github/workflows/release.yml | 18 +++++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f962fca..9186598f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,6 @@ jobs: libepoxy-dev \ libegl1-mesa-dev \ libgbm-dev \ - libgl1 \ - libgbm1 \ - libgl1-mesa-dev \ libgles2-mesa-dev \ libinput-dev \ libpciaccess-dev \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00019e8c..c98a5ffc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,15 +28,19 @@ jobs: libinput-devel \ libpciaccess-devel \ libudev-devel \ + libXfont2-devel \ libxkbcommon-x11-devel \ + libxkbfile-devel \ libxml2-devel \ mesa-libEGL-devel \ mesa-libgbm-devel \ + openssl \ xcb-util-devel \ xcb-util-image-devel \ xcb-util-keysyms-devel \ xcb-util-renderutil-devel \ xcb-util-wm-devel \ + xorg-x11-font-utils \ xorg-x11-xtrans-devel \ ninja-build \ wget @@ -87,13 +91,6 @@ jobs: ninja -C build DESTDIR=~/wayland ninja -C build install 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 - ninja -C build install - name: Build libdrm working-directory: drm-libdrm-${{ env.libdrm-version }} run: | @@ -115,6 +112,13 @@ jobs: ninja -C build DESTDIR=~/wayland ninja -C build install 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 + ninja -C build install - name: Build wlroots working-directory: wlroots-${{ env.wlroots-version }} run: |