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.

6 files changed, 15 insertions, 59 deletions

diff --git a/.gitlab-ci/Dockerfile.gtk4 b/.gitlab-ci/Dockerfile.gtk4
deleted file mode 100644
index a1e60348..00000000
--- a/.gitlab-ci/Dockerfile.gtk4
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/pygobject/main:v11
-
-USER root
-
-RUN python3 -m pip install meson==0.49.2
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y \
-    libfribidi-dev \
-    libgraphene-1.0-dev \
-    libgstreamer-plugins-bad1.0-dev \
-    libgtk-3-dev \
-    libwayland-dev \
-    libxml2-dev \
-    wayland-protocols \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \
-    && cd gtk \
-    && git checkout 833442e1e29e5 \
-    &&  meson -Dprefix=/usr -Dbuild-tests=false -Ddemos=false -Dbuild-examples=false -Dprint-backends=none _build \
-    && ninja -C _build \
-    && ninja -C _build install \
-    && cd .. \
-    && rm -Rf gtk
-
-USER user
-ENV PYENV_VERSION 3.7.3-debug
diff --git a/.gitlab-ci/run-docker-gtk4.sh b/.gitlab-ci/run-docker-gtk4.sh
deleted file mode 100755
index e2de0858..00000000
--- a/.gitlab-ci/run-docker-gtk4.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v4"
-
-sudo docker build --tag "${TAG}" --file "Dockerfile.gtk4" .
-sudo docker run --rm --security-opt label=disable \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
diff --git a/.gitlab-ci/run-docker-runtime.sh b/.gitlab-ci/run-docker-runtime.sh
index 0205ec6c..d70cba3c 100755
--- a/.gitlab-ci/run-docker-runtime.sh
+++ b/.gitlab-ci/run-docker-runtime.sh
@@ -8,4 +8,4 @@ sudo docker pull "${TAG}"
 sudo docker run --privileged --rm --security-opt label=disable \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
     --tty --interactive "${TAG}" xvfb-run -a flatpak run --filesystem=host \
-    --share=network --socket=x11 --command=bash org.gnome.Sdk//master
+    --share=network --socket=x11 --devel --command=bash org.gnome.Sdk//master
diff --git a/.gitlab-ci/test-docker-gtk4.sh b/.gitlab-ci/test-docker-gtk4.sh
deleted file mode 100755
index 0dd12199..00000000
--- a/.gitlab-ci/test-docker-gtk4.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# ccache setup
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-COV_DIR="$(pwd)/coverage"
-export COVERAGE_FILE="${COV_DIR}/.coverage.${CI_JOB_NAME}"
-mkdir -p "${COV_DIR}"
-mkdir -p "${CCACHE_DIR}"
-
-# test
-python -m pip install git+https://github.com/pygobject/pycairo.git
-python -m pip install pytest pytest-faulthandler coverage
-g-ir-inspect Gtk --version=4.0 --print-typelibs
-export TEST_GTK_VERSION=4.0
-python setup.py build_tests
-xvfb-run -a python -m coverage run tests/runtests.py
diff --git a/.gitlab-ci/test-flatpak-gtk4.sh b/.gitlab-ci/test-flatpak-gtk4.sh
new file mode 100755
index 00000000..189d63cd
--- /dev/null
+++ b/.gitlab-ci/test-flatpak-gtk4.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+COV_DIR="$(pwd)/coverage"
+export COVERAGE_FILE="${COV_DIR}/.coverage.gtk4"
+mkdir -p "${COV_DIR}"
+
+export TEST_GTK_VERSION=4.0
+python3 -m pip install --user pytest pytest-faulthandler coverage
+python3 setup.py build_tests
+python3 -m coverage run tests/runtests.py
+chmod -R 777 "${COV_DIR}"
\ No newline at end of file
diff --git a/.gitlab-ci/test-flatpak.sh b/.gitlab-ci/test-flatpak.sh
index 0dd01c46..b76eefa6 100755
--- a/.gitlab-ci/test-flatpak.sh
+++ b/.gitlab-ci/test-flatpak.sh
@@ -6,4 +6,4 @@ python3 -m pip install --user pytest pytest-faulthandler
 # for some reason pip3 fails the first time now..
 # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/issues/776
 python3 -m pip install --user pytest pytest-faulthandler
-python3 setup.py test -s
+python3 setup.py test -s
\ No newline at end of file