diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-02-12 18:21:00 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-02-12 18:24:54 +0000 |
| commit | 4247bf0fb64f5d9e65ac83f7cc48555c43e07cfd (patch) | |
| tree | 8f24d505511acd22a46a357f43cfd3a48ed43ad1 | |
| parent | f2da5e561700c522a1408b3424a2791a26be628b (diff) | |
| download | gtk+-4247bf0fb64f5d9e65ac83f7cc48555c43e07cfd.tar.gz | |
ci: Update flatpak job
Use `flatpak build` and point at the nightly repo when generating the
bundle.
| -rw-r--r-- | .gitlab-ci/flatpak-build.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh index 7b9464d130..9b27b6290e 100644 --- a/.gitlab-ci/flatpak-build.sh +++ b/.gitlab-ci/flatpak-build.sh @@ -4,7 +4,7 @@ set -e appid=$1 -builddir=app +builddir=flatpak_app repodir=repo flatpak-builder \ @@ -12,12 +12,10 @@ flatpak-builder \ ${builddir} \ build-aux/flatpak/${appid}.json -flatpak-builder \ - --run ${builddir} build-aux/flatpak/${appid}.json \ - meson \ - --prefix /app \ - --libdir /app/lib \ - --buildtype release \ +flatpak build ${builddir} meson \ + --prefix=/app \ + --libdir=/app/lib \ + --buildtype=release \ -Dx11-backend=true \ -Dwayland-backend=true \ -Dprint-backends=file \ @@ -27,9 +25,7 @@ flatpak-builder \ -Ddemos=true \ _build . -flatpak-builder \ - --run ${builddir} build-aux/flatpak/${appid}.json \ - ninja -C _build install +flatpak build ${builddir} ninja -C _build install flatpak-builder \ --finish-only \ @@ -40,5 +36,5 @@ flatpak-builder \ flatpak build-bundle \ ${repodir} \ ${appid}-dev.flatpak \ - --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \ + --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo \ ${appid} |