diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-19 14:57:26 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-22 16:23:22 +0100 |
| commit | fd80dc1650892d0406283beae8024b6bba98363d (patch) | |
| tree | 498bccc2cbdf300357e35abd9a870b5798fdb4e1 /.gitlab-ci.yml | |
| parent | a772ad9dbf70c4388cb09599bdf4f5bce1fceb17 (diff) | |
| download | d-feet-fd80dc1650892d0406283beae8024b6bba98363d.tar.gz | |
ci: Use meson as buildsystem
Due to the recent addition of meson to d-feet, the CI-built has been
changed to use it.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b65d4e2..ad9928f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,16 +10,20 @@ fedora: image: fedora:rawhide before_script: - dnf update -y - - dnf install -y desktop-file-utils gettext glib2-devel gobject-introspection-devel gtk3-devel intltool itstool python3-devel python3-pycodestyle libappstream-glib libwnck3 python3-gobject python3-gobject make yelp-tools xorg-x11-server-Xvfb + - dnf install -y desktop-file-utils dbus-daemon gettext glib2-devel gobject-introspection-devel gtk3-devel intltool itstool meson ninja-build python3-devel python3-pycodestyle libappstream-glib libwnck3 python3-gobject python3-gobject make yelp-tools xorg-x11-server-Xvfb script: - - PYTHON=/usr/bin/python3 ./autogen.sh - - make - - xvfb-run -a -s "-screen 0 1024x768x24" make check + - meson _build + - ninja -C _build + - mkdir -p /run/dbus + - mkdir -p /var + - ln -s /var/run /run + - dbus-daemon --system --fork + - xvfb-run -a -s "-screen 0 1024x768x24" ninja -C _build test artifacts: when: on_failure name: "d-feet-${CI_COMMIT_REF_NAME}-${CI_JOB_NAME}" paths: - - "${CI_PROJECT_DIR}/src/tests/test-suite.log" + - "${CI_PROJECT_DIR}/_build/meson-logs/testlog.txt" flatpak: image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master @@ -30,22 +34,23 @@ flatpak: MANIFEST_PATH: "org.gnome.dfeet.json" RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" FLATPAK_MODULE: "d-feet" - CONFIGURE_ARGS: "PYTHON=/usr/bin/python3 --disable-tests" + CONFIGURE_ARGS: "-Dtests=true" DBUS_ID: "org.gnome.dfeet" BUILD_DIR: ".app" script: - flatpak-builder --stop-at=${FLATPAK_MODULE} ${BUILD_DIR} ${MANIFEST_PATH} - - flatpak build ${BUILD_DIR} ./autogen.sh --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS} - - flatpak build ${BUILD_DIR} make install + - flatpak build ${BUILD_DIR} meson --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS} _build + - flatpak build ${BUILD_DIR} ninja -C _build install - flatpak-builder --finish-only --repo=repo ${BUILD_DIR} ${MANIFEST_PATH} - - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build ${BUILD_DIR} make check + - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build ${BUILD_DIR} ninja -C _build test - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID} artifacts: paths: - ${BUNDLE} - - config.log + - _build/meson-logs/meson-log.txt + - _build/meson-logs/testlog.txt expire_in: 30 days cache: |