From 82e7d4ceeeba7f425123228d2f5ee855d7bf0078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 May 2020 00:59:18 +0200 Subject: [PATCH 1/2] Use miniforge branch of ci-support for conda CIs --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index effbd8ce..1d02ebad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" tags: - linux @@ -101,7 +101,7 @@ Python 3 Conda Apple: # https://stackoverflow.com/q/60934005; https://reviews.llvm.org/D71579 - export LDFLAGS="-mlinker-version=519" - set -o xtrace - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" tags: -- GitLab From 5b48597b04aad2777b1dee67a996bb49fcd708d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 24 May 2020 01:04:08 +0200 Subject: [PATCH 2/2] Remove extraneous quotes in Gitlab CI yaml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d02ebad..602233a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ Python 3 Conda: - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" + - . ./build-and-test-py-project-within-miniconda.sh tags: - linux - large-node @@ -102,7 +102,7 @@ Python 3 Conda Apple: - export LDFLAGS="-mlinker-version=519" - set -o xtrace - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/miniforge/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" + - . ./build-and-test-py-project-within-miniconda.sh tags: - apple -- GitLab