From 703a1baf8bab2ebc4c8af876d8967e452351b113 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Thu, 16 Aug 2018 05:40:23 +0300
Subject: [PATCH] CI: Move repo export right before the bundle generation

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 616b7a0..8e28a69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - review
 
 variables:
-    BUNDLE: "org.gnome.Podcasts.${CI_COMMIT_REF_SHA}.flatpak"
+    BUNDLE: "org.gnome.Podcasts.${CI_COMMIT_SHA}.flatpak"
 
 flatpak:
     image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.28"
@@ -23,8 +23,6 @@ flatpak:
         # Build the flatpak repo
         - flatpak-builder --run app ${MANIFEST_PATH} meson --prefix=/app _build
         - flatpak-builder --run app ${MANIFEST_PATH} ninja -C _build install
-        - flatpak-builder --finish-only app ${MANIFEST_PATH}
-        - flatpak build-export repo app
 
         # Run the tests
         - |
@@ -38,6 +36,8 @@ flatpak:
         # - flatpak-builder --run app ${MANIFEST_PATH} cargo test -- --test-threads=1 --ignored
 
         # Create a flatpak bundle
+        - flatpak-builder --finish-only app ${MANIFEST_PATH}
+        - flatpak build-export repo app
         - flatpak build-bundle repo ${BUNDLE} ${DBUS_ID}
 
     artifacts: