summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-05-11 08:39:38 -0400
committerMatthias Clasen <mclasen@redhat.com>2023-05-11 08:39:38 -0400
commit87e7ea60801aeb4dd6b67c5d93e075da586ead28 (patch)
treeacd51829c8bd0e42619e0dc7897c977f922b59a3
parentb1945b38e846013c96e3cc29d4117060240903e9 (diff)
downloadgtk+-87e7ea60801aeb4dd6b67c5d93e075da586ead28.tar.gz
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.
-rw-r--r--.gitlab-ci.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 947c9e36ad..60a30336b7 100644
--- 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: