[gnome-build-meta/abderrahim/simplify-publish: 4/4] .gitlab-ci: use a single job for publishing all architecture flatpaks

[Jordan Petridis <jpetridis src gnome org>]

commit a22de225a83ce3727f4190eed0c79b3d55d4373f
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Nov 24 11:51:02 2020 +0100

    .gitlab-ci: use a single job for publishing all architecture flatpaks

 .gitlab-ci.yml              | 38 ++++++++++++++++++++------------------
 .gitlab-ci/flat-manager.yml | 21 +++++++++++----------
 2 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 707c79cd..28113148 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,20 +174,11 @@ 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
 
@@ -197,26 +188,37 @@ 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-$ARCH:
+    flatmgr:
       extends:
       - .flatmgr-template
-      - .$ARCH
+      - .x86_64
     END
-    done
 
   artifacts:
     paths:
diff --git a/.gitlab-ci/flat-manager.yml b/.gitlab-ci/flat-manager.yml
index 21ce2498..0589092f 100644
--- a/.gitlab-ci/flat-manager.yml
+++ b/.gitlab-ci/flat-manager.yml
@@ -35,19 +35,20 @@ default:
   stage: deploy
   dependencies: [flatmgr-prepare]
   script:
-  - TARGETS_REPO=TARGETS_${FLAT_MANAGER_REPO}
-  - TARGETS_REPO_ARCH=TARGETS_${FLAT_MANAGER_REPO}_${ARCH}
-  - TARGETS="$TARGETS ${!TARGETS_REPO} ${!TARGETS_REPO_ARCH}"
-
-  - $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/
+    for ARCH in $SUPPORTED_ARCHES; do
+      TARGETS_ARCH=TARGETS_${ARCH}
+      TARGETS="$TARGETS ${!TARGETS_ARCH}"
+
+      $BST -o arch $ARCH pull $TARGETS
+
+      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
     done
 
   - ostree fsck --repo repo/ --all