From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Mon, 19 Dec 2022 03:38:28 +0000 (+0530)
Subject: ci: Always update subprojects to latest revision
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~23^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=64c8da1bdd920a282fd437f366e3910eefe8ceaf;p=gtk4.git

ci: Always update subprojects to latest revision

Otherwise we're not actually updating anything. `meson subprojects
download` will skip subprojects that already exist.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6d5ca05e5..fbe70a21ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,6 +88,7 @@ fedora-x86_64:
     - export PATH="$HOME/.local/bin:$PATH"
     - pip3 install --user meson~=0.64
     - meson subprojects download
+    - meson subprojects update --reset
     - mkdir _install
     - meson setup
             --prefix=${CI_PROJECT_DIR}/_install
@@ -116,6 +117,7 @@ release-build:
     - export PATH="$HOME/.local/bin:$PATH"
     - pip3 install --user meson~=0.64
     - meson subprojects download
+    - meson subprojects update --reset
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build
     - meson compile -C _build
     - .gitlab-ci/run-tests.sh _build x11
@@ -141,6 +143,7 @@ fedora-mingw64:
     - export PATH="$HOME/.local/bin:$PATH"
     - pip3 install --user meson~=0.64
     - meson subprojects download
+    - meson subprojects update --reset
       # Test that mingw64-meson still fails. If it has stopped failing, the CI
       # will fail and now you should remove the hack that follows this.
     - FAILED=false
@@ -168,6 +171,7 @@ installed-tests:
     - export PATH="$HOME/.local/bin:$PATH"
     - pip3 install --user meson~=0.64
     - meson subprojects download
+    - meson subprojects update --reset
     - meson setup
         --prefix="${CI_PROJECT_DIR}/_installed"
         ${COMMON_MESON_FLAGS}