From 481db78d14e79f3a31cb69b6cea969b8d8d1f46e Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 14 May 2019 19:49:28 -0500 Subject: [PATCH 1/2] Add an Apple CI job Closes #1 --- .gitlab-ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43f38b8..e9f1088 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,4 +26,19 @@ Python 3: - tags artifacts: reports: - junit: test/pytest.xml \ No newline at end of file + junit: test/pytest.xml + +Python 3 Apple: + script: + - py_version=3 + - EXTRA_INSTALL="numpy pybind11" + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - ". ./build-and-test-py-project.sh" + tags: + - python3 + - apple + except: + - tags + artifacts: + reports: + junit: test/pytest.xml -- GitLab From fee77c59f428a2cb8a8366f408e7d60d4774eb2d Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 14 May 2019 19:51:02 -0500 Subject: [PATCH 2/2] Use 2.7 instead of 3 --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9f1088..0101bd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,22 +13,22 @@ Python 2.7: reports: junit: test/pytest.xml -Python 3: +Python 2.7 Apple: script: - - py_version=3 + - py_version=2.7 - EXTRA_INSTALL="numpy pybind11" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3 - - linux + - python2.7 + - apple except: - tags artifacts: reports: junit: test/pytest.xml -Python 3 Apple: +Python 3: script: - py_version=3 - EXTRA_INSTALL="numpy pybind11" @@ -36,7 +36,7 @@ Python 3 Apple: - ". ./build-and-test-py-project.sh" tags: - python3 - - apple + - linux except: - tags artifacts: -- GitLab