diff options
author | Bastien Nocera <hadess@hadess.net> | 2019-09-25 15:35:19 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2019-09-25 17:40:44 +0200 |
commit | 307a9f91fb42617fe0cd29ed098eeacdf7c78c3c (patch) | |
tree | c5ef7d083d450d6c613289a9c29bdcfb58025c99 /.gitlab-ci.yml | |
parent | 7175417d2fe5dfa665b5db2c0878c495cf89f508 (diff) | |
download | totem-307a9f91fb42617fe0cd29ed098eeacdf7c78c3c.tar.gz |
ci: Update to the current version of the Flatpak CI initiative
See https://mail.gnome.org/archives/desktop-devel-list/2019-September/msg00028.html
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 53 |
1 files changed, 10 insertions, 43 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60c4ed0d7..d59598235 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 @@ -14,65 +16,30 @@ build-fedora: variables: # Replace with your preferred file name of the resulting Flatpak bundle - BUNDLE: "org.gnome.TotemDevel.flatpak" + BUNDLE: "org.gnome.Totem.Devel.flatpak" GIT_SUBMODULE_STRATEGY: normal -flatpak: +flatpak:master: + extends: .flatpak image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master stage: test variables: # Replace with your manifest path MANIFEST_PATH: "flatpak/org.gnome.Totem.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: "totem" # 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: "-Denable-easy-codec-installation=no" - DBUS_ID: "org.gnome.Totem" - - script: - - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH} - # Make sure to keep this in sync with the Flatpak manifest, all arguments - # are passed except the config-args because we build it ourselves - - flatpak build app meson --prefix=/app ${MESON_ARGS} _build - - flatpak build app ninja -j1 -C _build install - - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH} - # Run automatic tests inside the Flatpak env - - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test - # Generate a Flatpak bundle - - 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 - expire_in: 30 days - cache: - paths: - - .flatpak-builder/cache + APP_ID: "org.gnome.Totem.Devel" review: + extends: .review stage: review dependencies: - - flatpak - script: - - echo "Generating flatpak deployment" - artifacts: - paths: - - ${BUNDLE} - expire_in: 30 days - environment: - name: review/$CI_COMMIT_REF_NAME - url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE} - on_stop: stop_review + - flatpak:master stop_review: + extends: .stop_review stage: review - script: - - echo "Stopping flatpak deployment" - when: manual - environment: - name: review/$CI_COMMIT_REF_NAME - action: stop |