diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index e710be0658..b6271c3610 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,6 +1,7 @@ FROM fedora:27 RUN dnf -y install \ + adwaita-icon-theme \ atk-devel \ at-spi2-atk-devel \ avahi-gobject-devel \ @@ -13,15 +14,18 @@ RUN dnf -y install \ gcc \ gcc-c++ \ gdk-pixbuf2-devel \ + gdk-pixbuf2-modules \ gettext \ git \ glib2-devel \ gobject-introspection-devel \ graphene-devel \ + iso-codes \ itstool \ json-glib-devel \ libepoxy-devel \ libmount-devel \ + librsvg2 \ libXcomposite-devel \ libXcursor-devel \ libXcursor-devel \ @@ -32,11 +36,13 @@ RUN dnf -y install \ libxkbcommon-devel \ libXrandr-devel \ libXrender-devel \ + mesa-dri-drivers \ mesa-libEGL-devel \ mesa-libwayland-egl-devel \ meson \ pango-devel \ redhat-rpm-config \ + sassc \ vulkan-devel \ wayland-devel \ wayland-protocols-devel \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 9568cab8a0..af8af9030a 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,8 +2,10 @@ set -e -sudo docker build --build-arg HOST_USER_ID="$UID" --tag "gitlab-gtk" \ +TAG="lazka/gitlab-gtk:v1" + +sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . sudo docker run --rm \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ - --tty --interactive "gitlab-gtk" bash + --tty --interactive "${TAG}" bash diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh index bddc7aa47a..2ba308c8c6 100755 --- a/.gitlab-ci/test-docker.sh +++ b/.gitlab-ci/test-docker.sh @@ -7,3 +7,11 @@ meson -Denable-x11-backend=true -Denable-wayland-backend=true \ -Denable-broadway-backend=true -Denable-vulkan=yes _build_full cd _build_full ninja + +xvfb-run -a -s "-screen 0 1024x768x24" \ + meson test \ + --print-errorlogs \ + --suite=gtk+ \ + --no-suite=gtk+:gdk \ + --no-suite=gtk+:gsk \ + --no-suite=gtk+:a11y