[gnome-build-meta/tristan/fdsdk-master-again: 26/26] Revert "Revert ".gitlab-ci.yml: rework pushing to flat-manager""

[Tristan Van Berkom <tvb src gnome org>]

commit 9167f10c8ce87f1e4d45ed9fcb1e70077c49d9e4
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Tue Jun 25 19:25:27 2019 +0900

    Revert "Revert ".gitlab-ci.yml: rework pushing to flat-manager""
    
    This reverts commit b322b3fc541703a259ce536246641045d14498de.

 .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