From e23b7eb5c5d0456ae7ec75e31788495effc05472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 26 Aug 2019 02:11:53 +0200 Subject: [PATCH 1/2] Make Conda Apple CI use Conda-installed Khronos ICD loader and pocl --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b1fccfd..d7e2036c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,6 +205,7 @@ Python 3 Conda Apple: - 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: - apple -- GitLab From 34217bfed4ea98a24321cc97f2b4023a9a69235a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 26 Aug 2019 02:15:16 +0200 Subject: [PATCH 2/2] Fix CI YAML validity --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7e2036c..0550a676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,7 +205,7 @@ Python 3 Conda Apple: - 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" + - "./configure.py --cxxflags= --ldflags= --cl-libname=OpenCL" - ". ./build-and-test-py-project-within-miniconda.sh" tags: - apple -- GitLab