From 985c6fa6a5ed3be33e79fa91662706f79b9a8511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 19 Jun 2020 07:08:24 +0200 Subject: [PATCH 1/3] Use Pypy3 in Gitlab CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32063a80..b9907954 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,7 +167,7 @@ Python 3 Conda Apple: PyPy POCL: script: - - export PY_EXE=pypy + - export PY_EXE=pypy3 - export PYOPENCL_TEST=portable:pthread # On pypy, this seems to install old versions from the package index -- GitLab From e61b0b9097e349791e76e362c856ee5b8b08c23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 19 Jun 2020 07:32:57 +0200 Subject: [PATCH 2/3] Fix Pypy3 Gitlab CI job name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9907954..cf750339 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ Python 3 Conda Apple: reports: junit: test/pytest.xml -PyPy POCL: +PyPy3 POCL: script: - export PY_EXE=pypy3 - export PYOPENCL_TEST=portable:pthread -- GitLab From 26c6933dbb9d63c69cf634f0bd30a2fd887d3e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sat, 20 Jun 2020 07:07:25 +0200 Subject: [PATCH 3/3] Allow pypy3 Gitlab CI to fail for now --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf750339..10027314 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,6 +179,8 @@ PyPy3 POCL: - 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" + allow_failure: true + tags: - pypy - pocl -- GitLab