diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-03 23:13:21 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-13 08:31:35 -0400 |
| commit | 8064b1b52c77535a56674fb9f533f9d87cee81f9 (patch) | |
| tree | 90a98f972167815f0ff015b30cdc211dc16e04de | |
| parent | 48d5b36b327908c807c1b1c8dac664e99744a274 (diff) | |
| download | gtk+-mutter-for-ci.tar.gz | |
ci: Set up XDG_RUNTIME_DIR differentlymutter-for-ci
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b571db7994..173231ac96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ variables: FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true" MESON_TEST_TIMEOUT_MULTIPLIER: 3 FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46" + XDG_RUNTIME_DIR: "${CI_PROJECT_DIR}/xdg-runtime-dir" workflow: rules: @@ -76,6 +77,8 @@ style-check-diff: key: "$CI_JOB_NAME" paths: - _ccache/ + before_script: + - mkdir -m 700 $XDG_RUNTIME_DIR fedora-x86_64: extends: .build-fedora-default diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index caea6deb2c..a1354f931e 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -31,8 +31,6 @@ case "${backend}" in ;; wayland*) - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" - dbus-run-session sh <<EOF mutter --headless --no-x11 --wayland-display wayland-5 >&mutter.log & |