From 16606f02c2fa55052d0bb1dae9541bc0fa46eecc Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 5 Oct 2021 16:17:47 +0200
Subject: [PATCH] [data] Use base environment for bdt to make it compatible
with boa
---
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
bob/devtools/data/gitlab-ci/single-package.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 7e86d794..634324c9 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -23,11 +23,11 @@ stages:
before_script:
- "[ -r ~/.condarc ] && rm -fv ~/.condarc"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- - python3 bootstrap.py -vv channel bdt
+ - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos)
- conda install -n base conda-build
- - conda activate bdt
+ - conda activate base
- bdt ci check -vv
cache:
paths:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 89a9a28a..94377a6f 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -23,11 +23,11 @@ stages:
before_script:
- "[ -r ~/.condarc ] && rm -fv ~/.condarc"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- - python3 bootstrap.py -vv channel bdt
+ - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos)
- conda install -n base conda-build
- - conda activate bdt
+ - conda activate base
- bdt ci check -vv
cache:
paths:
--
GitLab