From ec1f68a235dbd1b1dd06b9591d54f7afd8b42c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 14:01:24 -0400 Subject: [PATCH 1/2] Add Pytest/JUnit/Gitlab integration, Py37 CI --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70c3c1a..498faae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,17 @@ +Python 2.6: + script: + - py_version=2.6 + - EXTRA_INSTALL=numpy + - 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: + - python2.6 + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + Python 2.7: script: - py_version=2.7 @@ -8,6 +22,9 @@ Python 2.7: - python2.7 except: - tags + artifacts: + reports: + junit: test/pytest.xml Python 3.6: script: @@ -16,20 +33,26 @@ Python 3.6: - 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.5 + - python3.6 except: - tags + artifacts: + reports: + junit: test/pytest.xml -Python 2.6: +Python 3.7 script: - - py_version=2.6 + - py_version=3.7m - EXTRA_INSTALL=numpy - 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: - - python2.6 + - python3.7 except: - tags + artifacts: + reports: + junit: test/pytest.xml Documentation: script: -- GitLab From 9b8ba54f6dd71a53bebce709e0dbd234e87b88c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 14:06:05 -0400 Subject: [PATCH 2/2] Add missing colon to CI config --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 498faae..9e883d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ Python 3.6: reports: junit: test/pytest.xml -Python 3.7 +Python 3.7: script: - py_version=3.7m - EXTRA_INSTALL=numpy -- GitLab