diff --git a/.builds/alpine.yml b/.builds/alpine.yml index bc809c6..70f729e 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -38,11 +38,6 @@ tasks: WAYLAND_VERSION=1.21.0 WLROOTS_VERSION=0.16.0 - cd scenefx - meson setup build --auto-features enabled --reconfigure -Dwerror=false -Dexamples=false - ninja -C build install - cd .. - cd wayland git checkout $WAYLAND_VERSION meson setup build -Ddocumentation=false -Dtests=false --prefix /usr @@ -55,6 +50,11 @@ tasks: sudo ninja -C build install cd .. + cd scenefx + meson setup build --auto-features enabled --reconfigure -Dwerror=false -Dexamples=false + ninja -C build install + cd .. + wget -nv https://ziglang.org/download/$ZIG_VERSION/zig-linux-x86_64-$ZIG_VERSION.tar.xz tar -xvf zig-linux-x86_64-$ZIG_VERSION.tar.xz 1>/dev/null sudo mv ./zig-linux-x86_64-$ZIG_VERSION/zig /usr/bin diff --git a/.github/workflows/arch.yaml b/.github/workflows/arch.yaml index a8e3ab4..bbae486 100644 --- a/.github/workflows/arch.yaml +++ b/.github/workflows/arch.yaml @@ -22,12 +22,6 @@ jobs: WAYLAND_VERSION=1.21.0 WLROOTS_VERSION=0.16.0 - git clone https://github.com/wlrfx/scenefx.git - cd scenefx - meson setup build --auto-features enabled --reconfigure -Dwerror=false -Dexamples=false - ninja -C build install - cd .. - git clone https://gitlab.freedesktop.org/wayland/wayland.git cd wayland git checkout $WAYLAND_VERSION @@ -42,6 +36,13 @@ jobs: ninja -C build install cd .. + git clone https://github.com/wlrfx/scenefx.git + cd scenefx + meson setup build --auto-features enabled --reconfigure -Dwerror=false -Dexamples=false + ninja -C build install + cd .. + + wget -nv https://ziglang.org/download/$ZIG_VERSION/zig-linux-x86_64-$ZIG_VERSION.tar.xz tar -xvf zig-linux-x86_64-$ZIG_VERSION.tar.xz 1>/dev/null mv ./zig-linux-x86_64-$ZIG_VERSION/zig /usr/bin