From d088f518b98bee632d8aef5b0195af5bf7e81a0a Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 30 Sep 2021 16:13:15 +0200
Subject: [PATCH] [ci] remove rm -f /root/.condarc instances
---
.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, 5 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 979cf1de..fb292345 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,10 @@ 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:
@@ -29,13 +33,7 @@ stages:
BUILD_EGG: "true"
tags:
- docker
- 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
+ image: quay.io/condaforge/linux-anvil-comp7
artifacts:
paths:
- dist/*.zip
@@ -53,10 +51,6 @@ 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
@@ -103,9 +97,6 @@ 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
@@ -150,9 +141,6 @@ 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 7bd73a27..dc28e06a 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -32,9 +32,6 @@ build_linux:
extends: .build_template
tags:
- docker
- before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
image: quay.io/condaforge/linux-anvil-cos7-x86_64
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index dc5643ff..5776ca08 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -22,8 +22,6 @@ stages:
- docker
image: quay.io/condaforge/linux-anvil-cos7-x86_64
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 c6a88d22..c8367797 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -19,8 +19,6 @@ 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 f1c3dcd5..23faf018 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -21,8 +21,6 @@ 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 a43a7c28..51352618 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -21,8 +21,6 @@ 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