From ab5fcaf8bb86fac5bd1ffa33a238e7b2698d6f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 3 Apr 2020 00:52:55 +0200 Subject: [PATCH 1/2] Add Py3 Conda CI job --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c64ff24..85a9c285 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,6 +183,21 @@ Python 2.7 Apple: reports: junit: test/pytest.xml +Python 3 Conda: + script: + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + - export CC=gcc + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + - "./configure.py --cxxflags= --ldflags= --cl-libname=OpenCL" + - ". ./build-and-test-py-project-within-miniconda.sh" + tags: + - large-node + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + Python 3 Conda Apple: script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml -- GitLab From cd082ff56cbd010d973bdf191c1116488f14b9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 3 Apr 2020 00:56:04 +0200 Subject: [PATCH 2/2] Fix Py3 conda CI job tag --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85a9c285..dcd29b6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,7 +191,7 @@ Python 3 Conda: - "./configure.py --cxxflags= --ldflags= --cl-libname=OpenCL" - ". ./build-and-test-py-project-within-miniconda.sh" tags: - - large-node + - linux except: - tags artifacts: -- GitLab