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



commit b322b3fc541703a259ce536246641045d14498de
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Jun 22 12:45:34 2019 -0500

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

 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e22fb62..61386287 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,17 +97,19 @@ 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/
 
-    - ostree init --repo repo/ --mode archive
+    - ${BST} -o arch "${ARCH}" checkout --hardlinks flatpak-runtimes.bst repo/
+
     - |
-      # remove freedesktop refs if we're pushing to flathub, push everything otherwise
       case $FLAT_MANAGER_SERVER in *flathub*)
-        export REFS=$(ostree refs --repo checkout-repo/ | grep -v org.freedesktop.Platform)
+        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
       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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]