From c7b527d5804f1b4e84ccd5bfe5ef22e084807645 Mon Sep 17 00:00:00 2001 From: RFCreate <107062289+RFCreate@users.noreply.github.com> Date: Thu, 12 Jun 2025 19:55:07 -0600 Subject: [PATCH] fix: 'meson build' deprecation --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fc60628..10f730d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,14 +77,14 @@ jobs: - name: Build wayland working-directory: wayland-${{ env.wayland-version }} run: | - meson build --prefix=/usr -Ddocumentation=false + meson setup build --prefix=/usr -Ddocumentation=false ninja -C build DESTDIR=~/wayland ninja -C build install sudo ninja -C build install - name: Build wayland-protocols working-directory: wayland-protocols-${{ env.wayland-protocols-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install sudo ninja -C build install @@ -92,7 +92,7 @@ jobs: working-directory: wlroots-${{ matrix.wlroots-version }} continue-on-error: ${{ matrix.wlroots-version == 'master' }} run: | - meson build --prefix=/usr -Dxwayland=enabled + meson setup build --prefix=/usr -Dxwayland=enabled ninja -C build DESTDIR=~/wayland ninja -C build install - name: Create artifact diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8e91ff0..f7e00ece 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,63 +93,63 @@ jobs: - name: Build wayland working-directory: wayland-${{ env.wayland-version }} run: | - meson build --prefix=/usr -Ddocumentation=false + meson setup build --prefix=/usr -Ddocumentation=false ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build wayland-protocols working-directory: wayland-protocols-${{ env.wayland-protocols-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build libdrm working-directory: libdrm-libdrm-${{ env.libdrm-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build seatd working-directory: seatd-${{ env.seatd-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build pixman working-directory: pixman-pixman-${{ env.pixman-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build inputproto working-directory: xorgproto-xorgproto-${{ env.inputproto-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr ninja -C build DESTDIR=~/wayland ninja -C build install ninja -C build install - name: Build libxcvt working-directory: libxcvt-libxcvt-${{ env.xcvt-version }} run: | - meson build --prefix=/usr + meson setup build --prefix=/usr 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 + meson setup 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: | - meson build --prefix=/usr -Dxwayland=enabled + meson setup build --prefix=/usr -Dxwayland=enabled ninja -C build DESTDIR=~/wayland ninja -C build install - name: Create artifact