From b42b18de2489caabb6158e522f4837ca1b6c5af8 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Wed, 15 May 2024 19:29:07 -0300 Subject: [PATCH] gitlab-ci: Re-enable pkg caching for deps-*cross job Reintroduce pkg caching for crossroad. The possibility of using it is one in thousands since we don't have distributed cache, but it's better than rely totally on MSYS2 mirrors, which can be be extremely sick sometimes. --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c43780374..5a3fa5e67b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,7 +413,6 @@ gimp-flatpak-x64: DEB_PYTHON_INSTALL_LAYOUT: "deb" PATH: "$CI_PROJECT_DIR/.local/bin:$CI_PROJECT_DIR/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/" - XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/" # TODO: Crossroads handling of universal variables still not perfect before_script: [] @@ -423,6 +422,13 @@ deps-win-x64-cross: - !reference [.win-cross, rules] needs: ["image-debian-x64"] stage: dependencies + variables: + XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/" + cache: + - key: ${CI_JOB_NAME}-pkg + paths: + - .cache/ + - !reference [.default, cache] script: - bash -x build/windows/gitlab-ci/1_build-deps-crossroad.sh - crossroad w64 gimp --run="build/windows/gitlab-ci/1_build-deps-crossroad.sh"