diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-03-27 12:45:20 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-03-27 12:47:05 +0100 |
| commit | 1b62d28cbb561c12f43f08819e1714c8bf068ef7 (patch) | |
| tree | f2717eb521d55ceaf391f0fe5867a8f7cee0b1aa | |
| parent | 69441cbaceae6fa1b5f2df150609fe59b2a67cea (diff) | |
| download | gtk+-1b62d28cbb561c12f43f08819e1714c8bf068ef7.tar.gz | |
ci: Move flatpak building to a script
The YAML is getting hard to modify, so let's use a simple script like we
do for the other CI jobs.
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .gitlab-ci/flatpak-build.sh | 44 |
2 files changed, 48 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e90190f1f5..04a57e0df0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,26 +26,18 @@ flatpak:demo: image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest stage: flatpak script: - - flatpak-builder --stop-at=gtk app build-aux/flatpak/org.gtk.Demo.json - - flatpak-builder --run app build-aux/flatpak/org.gtk.Demo.json meson --prefix /app --libdir /app/lib --buildtype debug -Dx11-backend=true -Dwayland-backend=true -Dprint-backends=file -Dbuild-tests=false -Ddemos=true _build . - - flatpak-builder --run app build-aux/flatpak/org.gtk.Demo.json ninja -C _build install - - flatpak-builder --finish-only --repo=repo app build-aux/flatpak/org.gtk.Demo.json - - flatpak build-bundle repo gtk-demo-dev.flatpak --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo org.gtk.Demo + - bash -x ./.gitlab-ci/flatpak-build.sh org.gtk.Demo artifacts: paths: - - gtk-demo-dev.flatpak + - org.gtk.Demo-dev.flatpak expire_in: 1 day flatpak:widget-factory: image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest stage: flatpak script: - - flatpak-builder --stop-at=gtk app build-aux/flatpak/org.gtk.WidgetFactory.json - - flatpak-builder --run app build-aux/flatpak/org.gtk.WidgetFactory.json meson --prefix /app --libdir /app/lib --buildtype debug -Dx11-backend=true -Dwayland-backend=true -Dprint-backends=file -Dbuild-tests=false -Ddemos=true _build . - - flatpak-builder --run app build-aux/flatpak/org.gtk.WidgetFactory.json ninja -C _build install - - flatpak-builder --finish-only --repo=repo app build-aux/flatpak/org.gtk.WidgetFactory.json - - flatpak build-bundle repo gtk-widget-factory-dev.flatpak --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo org.gtk.WidgetFactory + - bash -x ./.gitlab-ci/flatpak-build.sh org.gtk.WidgetFactory artifacts: paths: - - gtk-widget-factory-dev.flatpak + - org.gtk.WidgetFactory-dev.flatpak expire_in: 1 day diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh new file mode 100644 index 0000000000..f01583458f --- /dev/null +++ b/.gitlab-ci/flatpak-build.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +set -e + +appid=$1 + +builddir=app +repodir=repo + +flatpak-builder \ + --stop-at=gtk \ + ${builddir} \ + build-aux/flatpak/${appid}.json + +flatpak-builder \ + --run ${builddir} build-aux/flatpak/${appid}.json \ + meson \ + --prefix /app \ + --libdir /app/lib \ + --buildtype debug \ + -Dx11-backend=true \ + -Dwayland-backend=true \ + -Dprint-backends=file \ + -Dbuild-tests=false \ + -Dbuild-examples=false \ + -Dintrospection=false \ + -Ddemos=true \ + _build . + +flatpak-builder \ + --run ${builddir} build-aux/flatpak/${appid}.json \ + ninja -C _build install + +flatpak-builder \ + --finish-only \ + --repo=${repodir} \ + ${builddir} \ + build-aux/flatpak/${appid}.json + +flatpak build-bundle \ + ${repodir} \ + ${appid}-dev.flatpak \ + --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \ + ${appid} |