diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 9dac46c5..d5b857a8 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -19,18 +19,19 @@ This directory contains the GitHub Actions workflows for the MangoWC project. - Workflow file itself: `.github/workflows/build.yml` **What it does**: -1. Installs system dependencies (wayland, libinput, etc.) -2. Builds wlroots 0.19 from source -3. Builds scenefx 0.4 from source -4. Configures the project with meson -5. Builds the project with ninja -6. Verifies the executables were created +1. Installs system dependencies (libinput, libdrm, etc.) +2. Builds wayland 1.23.1 from source (Ubuntu has older 1.22) +3. Builds wlroots 0.19 from source +4. Builds scenefx 0.4.1 from source +5. Configures the project with meson +6. Builds the project with ninja +7. Verifies the executables were created **Dependencies**: - Ubuntu latest runner - Meson build system - Ninja build tool -- Wayland ecosystem libraries +- Wayland 1.23.1 (built from source) - wlroots 0.19 - scenefx 0.4.1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8c420c6..8b3d5507 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,6 @@ jobs: meson \ ninja-build \ wayland-protocols \ - libwayland-dev \ libinput-dev \ libxkbcommon-dev \ libpcre2-dev \ @@ -57,8 +56,22 @@ jobs: libliftoff-dev \ libdisplay-info-dev \ libseat-dev \ + libffi-dev \ + libexpat1-dev \ + libxml2-dev \ pkg-config + - name: Build and install wayland 1.23 + run: | + # Build wayland 1.23 from source since Ubuntu has older version + git clone https://gitlab.freedesktop.org/wayland/wayland.git + cd wayland + git checkout 1.23.1 + meson setup build/ --prefix=/usr -Ddocumentation=false + sudo ninja -C build/ install + sudo ldconfig + cd .. + - name: Install wlroots 0.19 run: | # Install wlroots 0.19 from source since it may not be in apt