From 4125860f03b4f188bcf97e73047a46baf6265ecf Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Fri, 1 Oct 2021 10:47:04 +0200
Subject: [PATCH] remove ~/.conda if it exists unless it's mac machine
---
bob/devtools/data/gitlab-ci/nightlies.yaml | 3 ++-
bob/devtools/data/gitlab-ci/noarch.yaml | 3 ++-
bob/devtools/data/gitlab-ci/single-package.yaml | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 94df69e7..ab606951 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -20,7 +20,8 @@ stages:
.bootstrap:
before_script:
- "[ -r ~/.condarc ] && rm -f ~/.condarc"
- - "[ -d ~/.conda ] && rm -rf ~/.conda"
+ # remove ~/.conda if it exists unless it's a mac machine
+ - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.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 e073cad9..5978b118 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -22,7 +22,8 @@ stages:
.bootstrap:
before_script:
- "[ -r ~/.condarc ] && rm -f ~/.condarc"
- - "[ -d ~/.conda ] && rm -rf ~/.conda"
+ # remove ~/.conda if it exists unless it's a mac machine
+ - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.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 578349fb..67b08f7e 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -22,7 +22,8 @@ stages:
.bootstrap:
before_script:
- "[ -r ~/.condarc ] && rm -f ~/.condarc"
- - "[ -d ~/.conda ] && rm -rf ~/.conda"
+ # remove ~/.conda if it exists unless it's a mac machine
+ - "[ -d ~/.conda ] && [ ! -d /Applications ] && rm -rf ~/.conda"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
--
GitLab