[data/gitlab-ci] cache pre-commit caches; improve CI scripts

bob/devtools/data/gitlab-ci/noarch.yaml

@@ -7,7 +7,8 @@ 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"
+  TORCH_HOME: "${CI_PROJECT_DIR}/.cache/torch"
+  PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit"
 
 
 # Definition of our build pipeline order
@@ -28,7 +29,9 @@ stages:
     - conda activate base
   cache:
     paths:
-      - torch
+      - miniconda.sh
+      - ${TORCH_HOME}
+      - ${PRE_COMMIT_HOME}
 
 
 # Build targets

bob/devtools/data/gitlab-ci/single-package.yaml

@@ -7,7 +7,8 @@ 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"
+  TORCH_HOME: "${CI_PROJECT_DIR}/.cache/torch"
+  PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit"
 
 
 # Definition of our build pipeline order
@@ -29,7 +30,8 @@ stages:
   cache:
     paths:
       - miniconda.sh
-      - torch
+      - ${TORCH_HOME}
+      - ${PRE_COMMIT_HOME}
 
 
 # Build targets