ci: Fix dependency ordering

Signed-off-by: Shinyzenith <[email protected]>
waycrate · Oct 17, 2023 · 7b7faa2 · 7b7faa2
1 parent d421123
commit 7b7faa2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git 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
@@ -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