From 4f892567247c02e342b915b8f760f912980a6c17 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 30 Sep 2021 19:51:15 +0200
Subject: [PATCH] replace /root/.conda with ~/.conda
---
.gitlab-ci.yml | 12 ++++++------
bob/devtools/data/gitlab-ci/base-build.yaml | 4 ++--
bob/devtools/data/gitlab-ci/docs.yaml | 4 ++--
bob/devtools/data/gitlab-ci/nightlies.yaml | 4 ++--
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
bob/devtools/data/gitlab-ci/single-package.yaml | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 979cf1de..f3771097 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,8 +31,8 @@ stages:
- docker
image: quay.io/condaforge/linux-anvil-cos7-x86_64
before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
+ - rm -f ~/.condarc
+ - rm -rf ~/.conda
- python3 ./bob/devtools/bootstrap.py -vv build
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
@@ -104,8 +104,8 @@ build_macos_intel_bob_devtools:
.deploy_template:
stage: deploy
before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
+ - rm -f ~/.condarc
+ - rm -rf ~/.conda
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
@@ -151,8 +151,8 @@ pypi:
except:
- branches
before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
+ - rm -f ~/.condarc
+ - rm -rf ~/.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 e7d11e97..d40997b7 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -33,8 +33,8 @@ build_linux:
tags:
- docker
before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
+ - rm -f ~/.condarc
+ - rm -rf ~/.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 e73f1721..93578235 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -22,8 +22,8 @@ stages:
- docker
image: quay.io/condaforge/linux-anvil-comp7
before_script:
- - rm -f /root/.condarc
- - rm -rf /root/.conda
+ - rm -f ~/.condarc
+ - 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/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index c446562b..94df69e7 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -19,8 +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"
+ - "[ -r ~/.condarc ] && rm -f ~/.condarc"
+ - "[ -d ~/.conda ] && 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 60d4374f..e073cad9 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -21,8 +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"
+ - "[ -r ~/.condarc ] && rm -f ~/.condarc"
+ - "[ -d ~/.conda ] && 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 a0b409c6..578349fb 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -21,8 +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"
+ - "[ -r ~/.condarc ] && rm -f ~/.condarc"
+ - "[ -d ~/.conda ] && rm -rf ~/.conda"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
--
GitLab