From 6ea51e2cd87b00d5d2443dbe1fb6e3beac5aa655 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sun, 11 Sep 2022 22:06:07 +0200
Subject: [PATCH] [data.gitlab-ci] Use XDG_CACHE_HOME for defining cache
 directory for torch, pip and pre-commit

---
 bob/devtools/data/gitlab-ci/docs.yaml           | 4 ++--
 bob/devtools/data/gitlab-ci/nightlies.yaml      | 7 +++----
 bob/devtools/data/gitlab-ci/noarch.yaml         | 7 +++----
 bob/devtools/data/gitlab-ci/python-package.yaml | 8 ++++----
 bob/devtools/data/gitlab-ci/single-package.yaml | 7 +++----
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 75bf044..dbca4d8 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 a81f6af..72a9bf7 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 387fb16..ba94780 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 01a0e33..b55045a 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 d472907..599b50e 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
-- 
GitLab