ci: Balance the work between jobs

The fedora-x86-64 build does not only build with debug,
it also does the hello build, and it runs the testsuite
multiple times.

Move the hello build to the fedora release build. The idea
is that this lets us do more work in parallel, and spend
less time waiting for the longest-running ci job.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 947c9e36ad4b5b34fc9e37a502c5ac6cda8c535b..60a30336b7b281f7b2eb7bdeec682b7e42751db8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,18 +88,13 @@ fedora-x86_64:
     - export PATH="$HOME/.local/bin:$PATH"
     - meson subprojects download
     - meson subprojects update --reset
-    - mkdir _install
     - meson setup
-            --prefix=${CI_PROJECT_DIR}/_install
             ${COMMON_MESON_FLAGS}
             ${EXTRA_MESON_FLAGS}
             ${BACKEND_FLAGS}
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - meson install -C _build
-    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
     - .gitlab-ci/run-tests.sh _build wayland_gles
@@ -115,13 +110,18 @@ release-build:
     - export PATH="$HOME/.local/bin:$PATH"
     - meson subprojects download
     - meson subprojects update --reset
+    - mkdir _install
     - meson setup
+            --prefix=${CI_PROJECT_DIR}/_install
             ${COMMON_MESON_FLAGS}
             ${EXTRA_MESON_FLAGS}
             ${BACKEND_FLAGS}
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
+    - meson install -C _build
+    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
+    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
 
 fedora-mingw64: