[d-feet/fix-ci-flatpak-build] ci: build Flatpak in .app, not app
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [d-feet/fix-ci-flatpak-build] ci: build Flatpak in .app, not app
- Date: Wed, 19 Sep 2018 19:16:25 +0000 (UTC)
commit 67c2801232c0b04ebc9563fbc1d48b7c4565f418
Author: Will Thompson <will willthompson co uk>
Date: Wed Sep 19 20:15:17 2018 +0100
ci: build Flatpak in .app, not app
intltool-update runs during make check and finds files inside app:
The following files contain translations and are currently not in use. Please
consider adding these to the POTFILES.in file, located in the po/ directory.
app/files/share/d-feet/ui/addconnectiondialog.ui
app/files/share/d-feet/ui/app-menu.ui
app/files/share/d-feet/ui/executedialog.ui
app/files/share/d-feet/ui/introspection.ui
app/files/share/d-feet/ui/mainwindow.ui
.gitlab-ci.yml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e1b6a4..b65d4e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,13 +32,14 @@ flatpak:
FLATPAK_MODULE: "d-feet"
CONFIGURE_ARGS: "PYTHON=/usr/bin/python3 --disable-tests"
DBUS_ID: "org.gnome.dfeet"
+ BUILD_DIR: ".app"
script:
- - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
- - flatpak build app ./autogen.sh --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS}
- - flatpak build app make install
- - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
- - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app make check
+ - flatpak-builder --stop-at=${FLATPAK_MODULE} ${BUILD_DIR} ${MANIFEST_PATH}
+ - flatpak build ${BUILD_DIR} ./autogen.sh --prefix=/app --libdir=/app/lib ${CONFIGURE_ARGS}
+ - flatpak build ${BUILD_DIR} make install
+ - flatpak-builder --finish-only --repo=repo ${BUILD_DIR} ${MANIFEST_PATH}
+ - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build ${BUILD_DIR} make check
- flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
artifacts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]