diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2018-08-02 14:22:13 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2018-08-06 21:00:18 +0200 |
| commit | 24d37ea424ec43423fd000647179e59215d6e1c5 (patch) | |
| tree | 93960edf10b701884b84be1802ec464e9e583385 | |
| parent | b5c3cdc8ff00a9d594772bcde0153e22b916e5bb (diff) | |
| download | gnome-desktop-wip/fmuellner/meson.tar.gz | |
ci: Switch build to mesonwip/fmuellner/meson
It is faster and it needs the extra testing.
https://gitlab.gnome.org/GNOME/gnome-desktop/merge_requests/7
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cebf6e51..7bc0ef65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: gtk-doc xkeyboard-config-devel intltool itstool gobject-introspection-devel systemd-devel iso-codes-devel libseccomp-devel gcc gcc-c++ glibc-devel gnome-common - make redhat-rpm-config + meson redhat-rpm-config TEST_DEPENDENCIES: gnome-desktop-testing xorg-x11-server-Xvfb glibc-langpack-he build_stable: @@ -18,12 +18,11 @@ build_stable: - dnf install -y --nogpgcheck $DEPENDENCIES - dnf install -y --nogpgcheck $TEST_DEPENDENCIES script: - - mkdir build + - meson --prefix=/usr -Dinstalled_tests=true build - cd build - - ../autogen.sh --disable-dependency-tracking --enable-installed-tests --prefix=/usr - - make - - make install - - make check + - ninja + - ninja install + - xvfb-run -a -s "-screen 0 1024x768x24" ninja test - xvfb-run -a -s "-screen 0 1024x768x24" gnome-desktop-testing-runner --report-directory=test-results gnome-desktop artifacts: |