diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml index 75bf044e9f67d404835f338d734c0e77b4f3fd48..dbca4d848f5a66925bad711dbc5aceeae9f36cfe 100644 --- a/bob/devtools/data/gitlab-ci/docs.yaml +++ b/bob/devtools/data/gitlab-ci/docs.yaml @@ -7,7 +7,7 @@ variables: PYTHONUNBUFFERED: "1" CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda" BOOTSTRAP: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/bootstrap.py" - TORCH_HOME: "${CI_PROJECT_DIR}/torch" + XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache" # The version of cuda at Idiap CONDA_OVERRIDE_CUDA: "11.6" @@ -33,7 +33,7 @@ stages: - conda clean --all cache: paths: - - torch + - ${XDG_CACHE_HOME}/torch # Build target diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml index a81f6afa84720753b7b0daccb1f6a7aa7710cd23..72a9bf74bf059535874fb70b7f673e78d5666472 100644 --- a/bob/devtools/data/gitlab-ci/nightlies.yaml +++ b/bob/devtools/data/gitlab-ci/nightlies.yaml @@ -6,8 +6,7 @@ variables: PYTHONUNBUFFERED: "1" CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda" BOOTSTRAP: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/bootstrap.py" - TORCH_HOME: "${CI_PROJECT_DIR}/.cache/torch" - PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit" + XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache" # Definition of our build pipeline order @@ -28,8 +27,8 @@ stages: cache: paths: - miniconda.sh - - ${TORCH_HOME} - - ${PRE_COMMIT_HOME} + - ${XDG_CACHE_HOME}/torch + - ${XDG_CACHE_HOME}/pre-commit # Build targets diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml index 387fb16376589f3294684e8a368ab1e10517406d..ba947809809c11f829f41ecd50e1ffba09f0741b 100644 --- a/bob/devtools/data/gitlab-ci/noarch.yaml +++ b/bob/devtools/data/gitlab-ci/noarch.yaml @@ -7,8 +7,7 @@ variables: PYTHONUNBUFFERED: "1" CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda" BOOTSTRAP: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/bootstrap.py" - TORCH_HOME: "${CI_PROJECT_DIR}/.cache/torch" - PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit" + XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache" # Definition of our build pipeline order @@ -32,8 +31,8 @@ stages: cache: paths: - miniconda.sh - - ${TORCH_HOME} - - ${PRE_COMMIT_HOME} + - ${XDG_CACHE_HOME}/torch + - ${XDG_CACHE_HOME}/pre-commit # Build targets diff --git a/bob/devtools/data/gitlab-ci/python-package.yaml b/bob/devtools/data/gitlab-ci/python-package.yaml index 01a0e335ced59b57368c6034ccaac524f905f489..b55045ac52afa105e1735172474b22f9d9330ded 100644 --- a/bob/devtools/data/gitlab-ci/python-package.yaml +++ b/bob/devtools/data/gitlab-ci/python-package.yaml @@ -4,11 +4,10 @@ # Definition of global variables (all stages) variables: PYTHONUNBUFFERED: "1" - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit" DEPLOY: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/deploy.py" # The version of cuda at Idiap CONDA_OVERRIDE_CUDA: "11.6" + XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache" # Definition of our build pipeline order @@ -43,8 +42,9 @@ build: cache: key: "build-py" paths: - - ${PRE_COMMIT_HOME} - - ${PIP_CACHE_DIR} + - ${XDG_CACHE_HOME}/pip + - ${XDG_CACHE_HOME}/torch + - ${XDG_CACHE_HOME}/pre-commit # Test targets diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index d4729072b0ab7b4844e9f93f712e0d4aeb881553..599b50ec169ba8723ff72645ddfdeb0e25effd1f 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -7,8 +7,7 @@ variables: PYTHONUNBUFFERED: "1" CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda" BOOTSTRAP: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/bootstrap.py" - TORCH_HOME: "${CI_PROJECT_DIR}/.cache/torch" - PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit" + XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache" # Definition of our build pipeline order @@ -32,8 +31,8 @@ stages: cache: paths: - miniconda.sh - - ${TORCH_HOME} - - ${PRE_COMMIT_HOME} + - ${XDG_CACHE_HOME}/torch + - ${XDG_CACHE_HOME}/pre-commit # Build targets