diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-06-08 11:30:35 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-06-08 12:17:19 -0400 |
| commit | 5383dcca3cb4b696011ea0c72565befde1e980f8 (patch) | |
| tree | b198e8889cbf64484d1a3467ee8db02f15f14831 | |
| parent | 2e415e266fc410b00801071c01c215dc791283df (diff) | |
| download | gtk+-ci-cache-fix.tar.gz | |
ci: Hard reset subprojectsci-cache-fix
Another attempt to make meson handle the
master -> main transition in glib.
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f195a3374f..d5e82efc48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,8 @@ fedora-x86_64: EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - rm -rf subprojects/glib + - meson subprojects update --reset - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - ninja -C _build @@ -94,7 +95,7 @@ release-build: EXTRA_MESON_FLAGS: "--buildtype=release" script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects update --reset - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - ninja -C _build @@ -109,7 +110,7 @@ installed-tests: G_TEST_ACCESSIBLE: 1 script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects update --reset - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - ninja -C _build @@ -164,6 +165,7 @@ macos: - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH - export MESON_FORCE_BACKTRACE=1 script: + - meson subprojects update --reset - meson -Dx11-backend=false -Dintrospection=disabled -Dcpp_std=c++11 |