[gnome-build-meta] .gitlab-ci.yml: rework pushing to flat-manager

[Abderrahim Kitouni <akitouni src gnome org>]

commit 21acf3376a07112a064e9cbf21bbf1d7b47661ef
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Jun 21 11:08:06 2019 +0100

    .gitlab-ci.yml: rework pushing to flat-manager
    
    flat-manager-client didn't like the bare repository we're using since 81c3b2

 .gitlab-ci.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61386287..5e22fb62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,19 +97,17 @@ before_script:
   dependencies: [track, flatpak-prepare]
   script:
     - ${BST} -o arch "${ARCH}" pull flatpak-runtimes.bst
+    - ${BST} -o arch "${ARCH}" checkout --hardlinks flatpak-runtimes.bst checkout-repo/
 
-    - ${BST} -o arch "${ARCH}" checkout --hardlinks flatpak-runtimes.bst repo/
-
+    - ostree init --repo repo/ --mode archive
     - |
+      # remove freedesktop refs if we're pushing to flathub, push everything otherwise
       case $FLAT_MANAGER_SERVER in *flathub*)
-        for ref in $(ostree refs --repo repo/); do
-          case $ref in runtimes/org.freedesktop.Platform.*)
-            ostree refs --repo repo/ --delete $ref
-          esac
-        done
-        ostree prune --repo repo/ --refs-only
+        export REFS=$(ostree refs --repo checkout-repo/ | grep -v org.freedesktop.Platform)
       esac
+    - flatpak build-commit-from --src-repo=checkout-repo/ repo/ $REFS
     - flatpak build-update-repo --generate-static-deltas repo/
+
     - flat-manager/flat-manager-client push $(cat build.txt) repo/
   only:
     - master