From e497f73316bd293427c482e4f4c09c3d44f034f4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 21 Mar 2018 14:24:56 +0200 Subject: [PATCH] gitlabci: run glib-compile-resources from the flatpak enviroment --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bba9106..1cd9aa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,14 +55,13 @@ nightly:test: flatpak: image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest 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: - # Build the flatpak repo - 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 ninja -C _build install - flatpak-builder --finish-only app org.gnome.Hammond.json