From 56bb5e9f163282359b24d39d725d0af85775cbe1 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 30 Sep 2021 19:49:37 +0200
Subject: [PATCH] Revert "[ci] remove rm -f /root/.condarc instances"
This reverts commit d088f518b98bee632d8aef5b0195af5bf7e81a0a.
---
.gitlab-ci.yml | 22 ++++++++++++++-----
bob/devtools/data/gitlab-ci/base-build.yaml | 3 +++
bob/devtools/data/gitlab-ci/docs.yaml | 2 ++
bob/devtools/data/gitlab-ci/nightlies.yaml | 2 ++
bob/devtools/data/gitlab-ci/noarch.yaml | 2 ++
.../data/gitlab-ci/single-package.yaml | 2 ++
6 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb292345..979cf1de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,10 +15,6 @@ stages:
# Build targets
.build_template:
stage: build
- before_script:
- - python3 ./bob/devtools/bootstrap.py -vv build
- - source ${CONDA_ROOT}/etc/profile.d/conda.sh
- - conda activate base
artifacts:
expire_in: 1 week
cache:
@@ -33,7 +29,13 @@ stages:
BUILD_EGG: "true"
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
+ before_script:
+ - rm -f /root/.condarc
+ - rm -rf /root/.conda
+ - python3 ./bob/devtools/bootstrap.py -vv build
+ - source ${CONDA_ROOT}/etc/profile.d/conda.sh
+ - conda activate base
artifacts:
paths:
- dist/*.zip
@@ -51,6 +53,10 @@ stages:
tags:
- macos
- intel
+ before_script:
+ - python3 ./bob/devtools/bootstrap.py -vv build
+ - source ${CONDA_ROOT}/etc/profile.d/conda.sh
+ - conda activate base
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.conda
@@ -97,6 +103,9 @@ build_macos_intel_bob_devtools:
# Deploy targets
.deploy_template:
stage: deploy
+ before_script:
+ - rm -f /root/.condarc
+ - rm -rf /root/.conda
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
@@ -141,6 +150,9 @@ pypi:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- branches
+ before_script:
+ - rm -f /root/.condarc
+ - rm -rf /root/.conda
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index debc5e75..e7d11e97 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -32,6 +32,9 @@ build_linux:
extends: .build_template
tags:
- docker
+ before_script:
+ - rm -f /root/.condarc
+ - rm -rf /root/.conda
image: quay.io/condaforge/linux-anvil-comp7
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 437bb213..e73f1721 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -22,6 +22,8 @@ stages:
- docker
image: quay.io/condaforge/linux-anvil-comp7
before_script:
+ - rm -f /root/.condarc
+ - rm -rf /root/.conda
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 167122e8..c446562b 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -19,6 +19,8 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
before_script:
+ - "[ -r /root/.condarc ] && rm -f /root/.condarc"
+ - "[ -d /root/.conda ] && rm -rf /root/.conda"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index bcfa8659..60d4374f 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -21,6 +21,8 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
before_script:
+ - "[ -r /root/.condarc ] && rm -f /root/.condarc"
+ - "[ -d /root/.conda ] && rm -rf /root/.conda"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 0945fef8..a0b409c6 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -21,6 +21,8 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
before_script:
+ - "[ -r /root/.condarc ] && rm -f /root/.condarc"
+ - "[ -d /root/.conda ] && rm -rf /root/.conda"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
--
GitLab