summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2019-10-18 22:19:33 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2019-10-19 00:18:57 +0200
commit15ae632842cb7722d0ac4bd2f8c08ab2f3befea5 (patch)
treeeae3d6d3c5675d80f3dc218e80e8ab15ce5f4994 /.gitlab-ci.yml
parente29b06546454a43ff4d138ce08618fa8664643fe (diff)
downloadpygobject-15ae632842cb7722d0ac4bd2f8c08ab2f3befea5.tar.gz
CI: Use gnome-master for testing with gtk4
This makes it easier to track upstream changes without us having to rebuild docker images. Downside is that we don't control it and API is still changing, so allow the job to fail.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33d6bc59..62818e4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,18 +111,19 @@ xenial-i386-py2:
script:
- bash -x ./.gitlab-ci/test-docker-old.sh
-gtk4:
+gnome-master:
+ allow_failure: true
stage: build_and_test
- image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v4
- artifacts:
- paths:
- - coverage/
+ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
script:
- - bash -x ./.gitlab-ci/test-docker-gtk4.sh
+ - xvfb-run -a flatpak run --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak.sh
-gnome-master:
+gnome-master-gtk4:
allow_failure: true
stage: build_and_test
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
script:
- - xvfb-run -a flatpak run --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak.sh
+ - xvfb-run -a flatpak run --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak-gtk4.sh
+ artifacts:
+ paths:
+ - coverage/ \ No newline at end of file