diff options
| author | Thomas Bechtold <tbechtold@suse.com> | 2020-03-22 07:05:16 +0100 |
|---|---|---|
| committer | Thomas Bechtold <tbechtold@suse.com> | 2020-03-22 07:09:28 +0100 |
| commit | 8513b46d85c8ddb9e0f515c0b6c6c465bef62e45 (patch) | |
| tree | bec9419e8fb757d634fd8dfa5fa90d35a305fe96 | |
| parent | 77762bc3f6e0dc5d9752a36d2938f2607c37fd59 (diff) | |
| download | d-feet-8513b46d85c8ddb9e0f515c0b6c6c465bef62e45.tar.gz | |
ci: Switch to flatpak ci initiative
Reuse the available CI template.
| -rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af76570..12bc801 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml' + stages: - test - review @@ -25,39 +27,23 @@ fedora: paths: - "${CI_PROJECT_DIR}/_build/meson-logs/testlog.txt" -flatpak: - image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master - stage: test +flatpak: + extends: .flatpak variables: + GIT_SUBMODULE_STRATEGY: normal + # Replace with your manifest path MANIFEST_PATH: "org.gnome.dfeet.json" - RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" + RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" + # Replace with your application name, as written in the manifest FLATPAK_MODULE: "d-feet" - CONFIGURE_ARGS: "-Dtests=true" - DBUS_ID: "org.gnome.dfeet" + APP_ID: "org.gnome.dfeet" BUILD_DIR: ".app" - - script: - - flatpak-builder --stop-at=${FLATPAK_MODULE} ${BUILD_DIR} ${MANIFEST_PATH} - - 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} - # TODO: debug test timeouts and re-enable tests - # - 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} - - _build/meson-logs/meson-log.txt - - _build/meson-logs/testlog.txt - when: always - expire_in: 30 days - - cache: - paths: - - .flatpak-builder/cache + # Make sure to keep this in sync with the Flatpak manifest, all arguments + # are passed except the config-args because we build it ourselves + MESON_ARGS: | + -Dtests=true review: stage: review |