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.
This commit is contained in:
Bruno Lopes 2024-05-15 19:29:07 -03:00
parent e59231d659
commit b42b18de24
1 changed files with 7 additions and 1 deletions

View File

@ -413,7 +413,6 @@ gimp-flatpak-x64:
DEB_PYTHON_INSTALL_LAYOUT: "deb" 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" 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_DATA_HOME: "$CI_PROJECT_DIR/.local/share/"
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
# TODO: Crossroads handling of universal variables still not perfect # TODO: Crossroads handling of universal variables still not perfect
before_script: [] before_script: []
@ -423,6 +422,13 @@ deps-win-x64-cross:
- !reference [.win-cross, rules] - !reference [.win-cross, rules]
needs: ["image-debian-x64"] needs: ["image-debian-x64"]
stage: dependencies stage: dependencies
variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
cache:
- key: ${CI_JOB_NAME}-pkg
paths:
- .cache/
- !reference [.default, cache]
script: script:
- bash -x build/windows/gitlab-ci/1_build-deps-crossroad.sh - bash -x build/windows/gitlab-ci/1_build-deps-crossroad.sh
- crossroad w64 gimp --run="build/windows/gitlab-ci/1_build-deps-crossroad.sh" - crossroad w64 gimp --run="build/windows/gitlab-ci/1_build-deps-crossroad.sh"