From 36f8b3e4a2f66c5a95ebbd014060c475ab416ed9 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 10 Jan 2020 15:15:06 +0100
Subject: [PATCH] [data] Also remove .conda directory if it exists
---
.gitlab-ci.yml | 3 +++
bob/devtools/data/gitlab-ci/base-build.yaml | 1 +
bob/devtools/data/gitlab-ci/docs.yaml | 1 +
bob/devtools/data/gitlab-ci/nightlies.yaml | 1 +
bob/devtools/data/gitlab-ci/single-package.yaml | 1 +
5 files changed, 7 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26031c3b..0869da04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ stages:
image: continuumio/conda-concourse-ci
before_script:
- rm -f /root/.condarc
+ - rm -rf /root/.conda
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -98,6 +99,7 @@ build_macosx_37:
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
@@ -142,6 +144,7 @@ pypi:
- 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 fdd44084..0c140767 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -38,6 +38,7 @@ build_linux:
- docker
before_script:
- rm -f /root/.condarc
+ - rm -rf /root/.conda
image: continuumio/conda-concourse-ci
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 7ef9ff72..c201aafd 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -22,6 +22,7 @@ stages:
image: continuumio/conda-concourse-ci
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 420772ac..5ab536c9 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -18,6 +18,7 @@ stages:
.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/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 27aae271..f4894140 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -20,6 +20,7 @@ stages:
.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
--
GitLab