From 294950df961f7434b8652f508a32636c4c8cead7 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 5 Aug 2021 08:45:56 +0200
Subject: [PATCH] [data/gitlab-ci] cache pre-commit caches; improve CI scripts
---
bob/devtools/data/gitlab-ci/noarch.yaml | 7 +++++--
bob/devtools/data/gitlab-ci/single-package.yaml | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index e34164dc..300d0bef 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/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
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 0f14aabe..6386c536 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/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
--
GitLab