[gnome-boxes/ci-fixes-gnome-3-34: 1/3] CI: Simplify .gitlab-ci file
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/ci-fixes-gnome-3-34: 1/3] CI: Simplify .gitlab-ci file
- Date: Tue, 19 Nov 2019 09:41:49 +0000 (UTC)
commit a4e021ca502baef478c6e45d48d4daac735d52be
Author: Felipe Borges <felipeborges gnome org>
Date: Wed Sep 18 15:33:49 2019 +0200
CI: Simplify .gitlab-ci file
By inheriting definitions from the gnome flatpak_ci_initiative, we
don't need to be so verbose in our .gitlab-ci file.
.gitlab-ci.yml | 52 +++++++---------------------------------------------
1 file changed, 7 insertions(+), 45 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac60f1c..470b96f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,73 +1,35 @@
-stages:
-- test
-- review
-- cross_distro
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
variables:
BUNDLE: "gnome-boxes.flatpak"
flatpak:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
- stage: test
variables:
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Boxes.json"
MESON_ARGS: "-Dflatpak=true -Dprofile=development"
FLATPAK_MODULE: "gnome-boxes"
RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
DBUS_ID: "org.gnome.BoxesDevel"
-
- 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 -C _build install
- - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
- # 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: 2 days
- cache:
- paths:
- - .flatpak-builder/cache
+ extends: .flatpak
review:
- stage: review
+ stage: deploy
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
- except:
- - master@GNOME/gnome-boxes
- - tags
+ extends: '.review'
stop_review:
- stage: review
+ stage: deploy
script:
- echo "Stopping flatpak deployment"
- when: manual
- environment:
- name: review/$CI_COMMIT_REF_NAME
- action: stop
- except:
- - master@GNOME/gnome-boxes
- - tags
+ extends: '.stop_review'
fedora:rawhide:
image: fedora:rawhide
- stage: cross_distro
+ stage: deploy
before_script:
- dnf update -y --nogpgcheck
- dnf install -y meson git vala gtk3-devel
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]