From a61ce97e482349100ac3d1bdf5c919cabf2508d3 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 16 May 2025 16:16:17 +0300 Subject: [PATCH] ci: Use the existing checkout to create the subproject cache Now that we have the monorepo, we always have a checkout of gstreamer and we don't need to explicitly clone it again. cbuild in ci-templates will always clone the repository in /tmp/clone and we can use that to initialize the cache. Part-of: --- .gitlab-image-tags.yml | 4 ++-- ci/scripts/create-subprojects-cache.sh | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 3a8a670c29..037bd4050e 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,9 +5,9 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2025-04-15.0' + FEDORA_TAG: '2025-05-23.0' - DEBIAN_TAG: '2025-04-15.0' + DEBIAN_TAG: '2025-05-23.0' CHECKS_TAG: '2025-02-04.0' diff --git a/ci/scripts/create-subprojects-cache.sh b/ci/scripts/create-subprojects-cache.sh index b9f667c746..33f625b99b 100644 --- a/ci/scripts/create-subprojects-cache.sh +++ b/ci/scripts/create-subprojects-cache.sh @@ -2,14 +2,12 @@ set -eux -branch="${GST_UPSTREAM_BRANCH:-main}" -repo_url="https://gitlab.freedesktop.org/gstreamer/gstreamer.git" - +# Path where cbuild checks out the repo +cd /tmp/clone/ # get gstreamer and make all subprojects available -git clone -b "${branch}" --depth=1 "${repo_url}" /gstreamer -git -C /gstreamer submodule update --init --depth=1 -meson subprojects download --sourcedir /gstreamer -./ci/scripts/handle-subprojects-cache.py --build --cache-dir /subprojects /gstreamer/subprojects/ +git submodule update --init --depth=1 +meson subprojects download +./ci/scripts/handle-subprojects-cache.py --build --cache-dir /subprojects /tmp/clone/subprojects/ # Avoid the cache being owned by root # and make sure its readable to anyone