[gnome-build-meta/abderrahim/revert-flatmgr-changes: 3/4] Revert ".gitlab-ci: avoid reusing variable name"




commit 5b776cabe6ca59232c6881ef511aff0e191acc6d
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Dec 8 08:38:52 2020 +0100

    Revert ".gitlab-ci: avoid reusing variable name"
    
    This reverts commit 4d7a37377ffc8eb786363f82eb02721f34b9a1f8.

 .gitlab-ci.yml              | 4 ++--
 .gitlab-ci/flat-manager.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3ed7fd8..28113148 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -197,7 +197,7 @@ generate-deploy-config:
       FLAT_MANAGER_SERVER: https://nightly.gnome.org/
       FLAT_MANAGER_REPO: nightly
       SUPPORTED_ARCHES: x86_64 i686 aarch64 ppc64le
-      COMMON_TARGETS: flatpak-runtimes.bst flatpak-platform-extensions.bst
+      TARGETS: flatpak-runtimes.bst flatpak-platform-extensions.bst
       TARGETS_x86_64: openh264-extension.bst:flatpak-repo.bst
     END
     else
@@ -205,7 +205,7 @@ generate-deploy-config:
       FLAT_MANAGER_SERVER: https://hub.flathub.org/
       FLAT_MANAGER_REPO: $FLAT_MANAGER_REPO
       SUPPORTED_ARCHES: x86_64 i686 aarch64
-      COMMON_TARGETS: flatpak-runtimes.bst
+      TARGETS: flatpak-runtimes.bst
     END
     fi
 
diff --git a/.gitlab-ci/flat-manager.yml b/.gitlab-ci/flat-manager.yml
index 9a97a894..0589092f 100644
--- a/.gitlab-ci/flat-manager.yml
+++ b/.gitlab-ci/flat-manager.yml
@@ -40,7 +40,7 @@ default:
   - |
     for ARCH in $SUPPORTED_ARCHES; do
       TARGETS_ARCH=TARGETS_${ARCH}
-      TARGETS="$COMMON_TARGETS ${!TARGETS_ARCH}"
+      TARGETS="$TARGETS ${!TARGETS_ARCH}"
 
       $BST -o arch $ARCH pull $TARGETS
 


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