diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-12-27 12:32:09 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-12-27 12:32:09 +0000 |
| commit | 265e27beb06945503422845f460cadadaab6b675 (patch) | |
| tree | 08c86ee8220f74e793e62faccd79a75a10178af3 | |
| parent | ac8a12cf0040710b95ddab77b687209d2797ae9c (diff) | |
| parent | b3a6a7ba84d4f9c1f4ed95551fb8099738188e5d (diff) | |
| download | libmediaart-265e27beb06945503422845f460cadadaab6b675.tar.gz | |
Merge branch 'sam/ci-fixes' into 'master'
ci: Update for changes in tracker-oci-images
See merge request GNOME/libmediaart!8
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6764c49..530b2ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,15 +15,15 @@ stages: stage: test script: - - su tracker -c 'mkdir build' - - su tracker -c 'cd build; meson ..' - - su tracker -c 'cd build; ninja' + - mkdir build; cd build + - meson .. + - ninja - | # Remove the many "CI_" variables from the environment. Meson dumps the # whole environment for every failed test, and that gives a whole # screenful of junk each time unless we strip these. unset $(env|grep -o '^CI_[^=]*') - su tracker -c 'cd build; env meson test --print-errorlogs ${MESON_TEST_EXTRA_ARGS}' + env meson test --print-errorlogs ${MESON_TEST_EXTRA_ARGS} after_script: - | @@ -45,19 +45,12 @@ stages: test-alpine-edge: image: registry.gitlab.gnome.org/gnome/tracker-oci-images/amd64/alpine:edge - before_script: - - apk add gdk-pixbuf-dev <<: *test test-fedora-latest: image: registry.gitlab.gnome.org/gnome/tracker-oci-images/amd64/fedora:latest - before_script: - - dnf install -y gdk-pixbuf2-devel <<: *test test-ubuntu-rolling: image: registry.gitlab.gnome.org/gnome/tracker-oci-images/amd64/ubuntu:rolling - before_script: - - apt-get update - - apt-get install -y libgdk-pixbuf2.0-dev <<: *test |