gitlabci: run glib-compile-resources from the flatpak enviroment

This commit is contained in:
Jordan Petridis 2018-03-21 14:24:56 +02:00
parent 28965dc2b1
commit e497f73316
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6

View File

@ -55,14 +55,13 @@ nightly:test:
flatpak: flatpak:
image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest
stage: flatpak stage: flatpak
before_script:
# https://gitlab.gnome.org/alatiera/Hammond/issues/55
- dnf install -y glib2-devel
# Force regeneration of gresources regardless of artifacts chage
- cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
script: script:
# Build the flatpak repo
- flatpak-builder --stop-at=hammond app org.gnome.Hammond.json - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
# https://gitlab.gnome.org/alatiera/Hammond/issues/55
# Force regeneration of gresources regardless of artifacts chage
- flatpak-builder --run app org.gnome.Hammond.json glib-compile-resources --sourcedir=hammond-gtk/resources/ hammond-gtk/resources/resources.xml
# Build the flatpak repo
- flatpak-builder --run app org.gnome.Hammond.json meson --prefix=/app --libdir=/app/lib _build - flatpak-builder --run app org.gnome.Hammond.json meson --prefix=/app --libdir=/app/lib _build
- flatpak-builder --run app org.gnome.Hammond.json ninja -C _build install - flatpak-builder --run app org.gnome.Hammond.json ninja -C _build install
- flatpak-builder --finish-only app org.gnome.Hammond.json - flatpak-builder --finish-only app org.gnome.Hammond.json