[gnome-build-meta/abderrahim/revert-flatmgr-changes: 4/4] Revert ".gitlab-ci: use a single job for publishing all architecture flatpaks"

[Abderrahim Kitouni <akitouni src gnome org>]

commit 42c02ecab6f4ff6aa9914c8f649e5d8254f0c6a9
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Dec 8 08:38:53 2020 +0100

    Revert ".gitlab-ci: use a single job for publishing all architecture flatpaks"
    
    This reverts commit a22de225a83ce3727f4190eed0c79b3d55d4373f.

 .gitlab-ci.yml              | 38 ++++++++++++++++++--------------------
 .gitlab-ci/flat-manager.yml | 21 ++++++++++-----------
 2 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28113148..707c79cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,11 +174,20 @@ generate-deploy-config:
   - TRACK_JOB_ID=$(cat track-job.id)
   - |
     case "$FLATPAK_BRANCH" in
+      master)
+        FLAT_MANAGER_SERVER=https://nightly.gnome.org/
+        FLAT_MANAGER_REPO=nightly
+        SUPPORTED_ARCHES="x86_64 i686 aarch64 ppc64le"
+      ;;
       *beta)
+        FLAT_MANAGER_SERVER=https://hub.flathub.org/
         FLAT_MANAGER_REPO=beta
+        SUPPORTED_ARCHES="x86_64 i686 aarch64"
       ;;
       *)
+        FLAT_MANAGER_SERVER=https://hub.flathub.org/
         FLAT_MANAGER_REPO=stable
+        SUPPORTED_ARCHES="x86_64 i686 aarch64"
       ;;
     esac
 
@@ -188,37 +197,26 @@ generate-deploy-config:
       XDG_CACHE_HOME: "${CI_PROJECT_DIR}/cache"
       BST: '$BST'
       TRACK_JOB_ID: '$TRACK_JOB_ID'
+      FLAT_MANAGER_SERVER: '$FLAT_MANAGER_SERVER'
+      FLAT_MANAGER_REPO: '$FLAT_MANAGER_REPO'
+      TARGETS: flatpak-runtimes.bst
+      TARGETS_nightly: flatpak-platform-extensions.bst
+      TARGETS_nightly_x86_64: openh264-extension.bst:flatpak-repo.bst
       ENVIRONMENT_NAME: flatpak/$FLATPAK_BRANCH
-    END
 
-  - |
-    if test $FLATPAK_BRANCH=master; then
-    cat >> flatpak-variables.yml << END
-      FLAT_MANAGER_SERVER: https://nightly.gnome.org/
-      FLAT_MANAGER_REPO: nightly
-      SUPPORTED_ARCHES: x86_64 i686 aarch64 ppc64le
-      TARGETS: flatpak-runtimes.bst flatpak-platform-extensions.bst
-      TARGETS_x86_64: openh264-extension.bst:flatpak-repo.bst
-    END
-    else
-    cat >> flatpak-variables.yml << END
-      FLAT_MANAGER_SERVER: https://hub.flathub.org/
-      FLAT_MANAGER_REPO: $FLAT_MANAGER_REPO
-      SUPPORTED_ARCHES: x86_64 i686 aarch64
-      TARGETS: flatpak-runtimes.bst
     END
-    fi
-
   - cat flatpak-variables.yml .gitlab-ci/flat-manager.yml > flatpak-deploy.yml
 
   - |
+    for ARCH in $SUPPORTED_ARCHES; do
     cat >> flatpak-deploy.yml << END
 
-    flatmgr:
+    flatmgr-$ARCH:
       extends:
       - .flatmgr-template
-      - .x86_64
+      - .$ARCH
     END
+    done
 
   artifacts:
     paths:
diff --git a/.gitlab-ci/flat-manager.yml b/.gitlab-ci/flat-manager.yml
index 0589092f..21ce2498 100644
--- a/.gitlab-ci/flat-manager.yml
+++ b/.gitlab-ci/flat-manager.yml
@@ -35,20 +35,19 @@ default:
   stage: deploy
   dependencies: [flatmgr-prepare]
   script:
-  - ostree init --repo repo/ --mode archive
+  - TARGETS_REPO=TARGETS_${FLAT_MANAGER_REPO}
+  - TARGETS_REPO_ARCH=TARGETS_${FLAT_MANAGER_REPO}_${ARCH}
+  - TARGETS="$TARGETS ${!TARGETS_REPO} ${!TARGETS_REPO_ARCH}"
 
-  - |
-    for ARCH in $SUPPORTED_ARCHES; do
-      TARGETS_ARCH=TARGETS_${ARCH}
-      TARGETS="$TARGETS ${!TARGETS_ARCH}"
+  - $BST -o arch $ARCH pull $TARGETS
 
-      $BST -o arch $ARCH pull $TARGETS
+  - ostree init --repo repo/ --mode archive
 
-      for target in $TARGETS; do
-        $BST -o arch $ARCH checkout --hardlinks $target checkout-repo/
-        ostree pull-local --repo repo/ checkout-repo/
-        rm -rf checkout-repo/
-      done
+  - |
+    for target in $TARGETS; do
+      $BST -o arch $ARCH checkout --hardlinks $target checkout-repo/
+      ostree pull-local --repo repo/ checkout-repo/
+      rm -rf checkout-repo/
     done
 
   - ostree fsck --repo repo/ --all