summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kohnert2022-07-03 14:32:24 +0000
committerJan Kohnert2022-07-03 14:32:24 +0000
commit2cd3b855d781f0c75734ef951cd162bbda448fe6 (patch)
tree59417c22c384748306860a456bb009b7c9ce3fe3
parent5f97f6c1854067d7fd36a75fcd703d0598381d02 (diff)
downloadaur-2cd3b855d781f0c75734ef951cd162bbda448fe6.tar.gz
Resolve "Use xvfb in automated testing environment"
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--Dockerfile.build_and_test2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 168cfb7e8603..acf545460c8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ build-gnudatalanguage:
- $PKG_NAME*.pkg.tar.zst
- src/gdl-*/build/Testing/Temporary/LastTest.log
when: always
- extends: .arch-build
+ extends: .arch-buildx
needs:
- job: "container-build-and-test"
artifacts: no
diff --git a/Dockerfile.build_and_test b/Dockerfile.build_and_test
index a1d30ac13ab4..b8e07bb28b08 100644
--- a/Dockerfile.build_and_test
+++ b/Dockerfile.build_and_test
@@ -3,7 +3,7 @@ ARG REGISTRY
FROM "$REGISTRY/common/gitlab-helper/archlinux-yay:master"
RUN (\
- yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk2 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib openssh \
+ yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk2 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib openssh xorg-server-xvfb \
&& yes | yay -Scc --noconfirm \
&& rm -rf ~/.cache/yay \
&& sudo rm -rf /var/cache/pacman/pkg/* \