test CI

jwijenbergh · May 5, 2024 · 9654bff · 9654bff
1 parent fed1058
commit 9654bff
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
       libdrm-version: "2.4.114"
       seatd-version: "0.6.4"
       pixman-version: "0.42.0"
+      xwayland-version: "21.1.3"
       hwdata-version: "0.364"
       wayland-version: "1.22.0"
       wayland-protocols-version: "1.32"
@@ -26,6 +27,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends \
+            libepoxy-dev \
             libegl1-mesa-dev \
             libgbm-dev \
             libgles2-mesa-dev \
@@ -42,8 +44,10 @@ jobs:
             libxcb-xinput-dev \
             libxcb1-dev \
             libxkbcommon-dev \
-            ninja-build \
-            xwayland
+            libxfont-dev \
+            xfonts-utils \
+            xserver-xorg \
+            ninja-build
           sudo pip install meson
       - name: Set environment variables
         run: |
@@ -55,13 +59,15 @@ jobs:
         run: |
           wget $WAYLAND_URL
           wget $WAYLAND_PROTOCOLS_URL
+          wget $XWAYLAND_URL
           wget $LIBDRM_URL
           wget -O seatd.tar.gz $SEATD_URL
           wget $PIXMAN_URL
           wget -O hwdata.tar.gz $HWDATA_URL
           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 drm-libdrm-${{ env.libdrm-version }}.tar.gz
           tar -xzf seatd.tar.gz
           tar -xjf pixman-pixman-${{ env.pixman-version }}.tar.bz2
@@ -70,6 +76,7 @@ jobs:
         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
           LIBDRM_URL: https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${{ env.libdrm-version }}/drm-libdrm-${{ env.libdrm-version }}.tar.gz
           SEATD_URL: https://git.sr.ht/~kennylevinsen/seatd/archive/${{ env.seatd-version }}.tar.gz
           PIXMAN_URL: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-${{ env.pixman-version }}/pixman-pixman-${{ env.pixman-version }}.tar.bz2
@@ -116,6 +123,13 @@ jobs:
           ./configure --prefix=/usr --libdir=/lib --datadir=/usr/share
           make
           sudo make 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-${{ matrix.wlroots-version }}
         continue-on-error: ${{ matrix.wlroots-version == 'master' }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,6 +13,7 @@ jobs:
       libdrm-version: "2.4.114"
       seatd-version: "0.6.3"
       pixman-version: "0.42.0"
+      xwayland-version: "21.1.3"
       wayland-protocols-version: "1.32"
       wayland-version: "1.22.0"
       wlroots-version: "0.17.0"
@@ -22,6 +23,7 @@ jobs:
           yum -y install \
             hwdata \
             python3-pip \
+            libepoxy-devel \
             libffi-devel \
             libinput-devel \
             libpciaccess-devel \
@@ -35,7 +37,7 @@ jobs:
             xcb-util-keysyms-devel \
             xcb-util-renderutil-devel \
             xcb-util-wm-devel \
-            xorg-x11-server-Xwayland \
+            xorg-x11-xtrans-devel \
             ninja-build \
             wget
       - name: Set environment variables
@@ -48,19 +50,22 @@ jobs:
         run: |
           wget $WAYLAND_URL
           wget $WAYLAND_PROTOCOLS_URL
+          wget $XWAYLAND_URL
           wget $LIBDRM_URL
           wget -O seatd.tar.gz $SEATD_URL
           wget $PIXMAN_URL
           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 drm-libdrm-${{ env.libdrm-version }}.tar.gz
           tar -xjf pixman-pixman-${{ env.pixman-version }}.tar.bz2
           tar -xzf seatd.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
           LIBDRM_URL: https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${{ env.libdrm-version }}/drm-libdrm-${{ env.libdrm-version }}.tar.gz
           SEATD_URL: https://git.sr.ht/~kennylevinsen/seatd/archive/${{ env.seatd-version }}.tar.gz
           PIXMAN_URL: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-${{ env.pixman-version }}/pixman-pixman-${{ env.pixman-version }}.tar.bz2
@@ -82,6 +87,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 libdrm
         working-directory: drm-libdrm-${{ env.libdrm-version }}
         run: |