From 2394670bf79c66ea8de54ee98770b80414f8466e Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Thu, 5 Apr 2018 20:58:57 +0300
Subject: [PATCH] Execute glib-compile-resources inside the flatpak env.

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb12e31c..d37e88b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,14 @@ stages:
 flatpak:
     image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest
     stage: test
-    before_script:
-        # same thing as https://gitlab.gnome.org/alatiera/Hammond/issues/55
-        - dnf install -y glib2-devel
-        # Force regeneration of gresources regardless of artifacts chage
-        - cd fractal-gtk/res/ && glib-compile-resources --generate resources.xml && cd ../../
     script:
-        # Build the flatpak repo
+        # Build the flatpak deps
         - flatpak-builder --stop-at=fractal app flatpak/org.gnome.Fractal.json
+
+        # https://gitlab.gnome.org/alatiera/Hammond/issues/55
+        # Force regeneration of gresources regardless of artifacts chage
+        - flatpak-builder --run app org.gnome.Fractal.json glib-compile-resources --sourcedir=fractal-gtk/res/ fractal-gtk/res/resources.xml
+
         - flatpak-builder --run app flatpak/org.gnome.Fractal.json meson --prefix=/app --libdir=/app/lib _build
         - flatpak-builder --run app flatpak/org.gnome.Fractal.json ninja -C _build install
         - flatpak-builder --finish-only app flatpak/org.gnome.Fractal.json
@@ -29,7 +29,6 @@ flatpak:
 
     cache:
         # JOB_NAME - Each job will have it's own cache
-        # COMMIT_REF_SLUG = Lowercase name of the branch
         # ^ Keep diffrerent caches for each branch
         key: "$CI_JOB_NAME"
         paths: