[gnome-build-meta/abderrahim/ostree-branch: 3/3] allow adding 'beta' to flatpak branch without affecting the ostree branch

[Abderrahim Kitouni <akitouni src gnome org>]

commit 4a2583af7eefe0b54aed60baa21adcd3655f986d
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Aug 13 15:36:15 2020 +0100

    allow adding 'beta' to flatpak branch without affecting the ostree branch

 elements/flatpak-runtimes.bst                 | 41 ++++++++++++++-------------
 elements/flatpak/platform-arch-libs-debug.bst |  2 +-
 elements/flatpak/platform-arch-libs.bst       |  2 +-
 elements/flatpak/platform-locale.bst          |  2 +-
 elements/flatpak/platform.bst                 |  4 +--
 elements/flatpak/sdk-arch-libs-debug.bst      |  2 +-
 elements/flatpak/sdk-arch-libs.bst            |  2 +-
 elements/flatpak/sdk-debug.bst                |  2 +-
 elements/flatpak/sdk-docs.bst                 |  2 +-
 elements/flatpak/sdk-locale.bst               |  2 +-
 elements/flatpak/sdk.bst                      |  4 +--
 project.conf                                  |  4 ++-
 12 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/elements/flatpak-runtimes.bst b/elements/flatpak-runtimes.bst
index 3b2b0a4f..f8b8448b 100644
--- a/elements/flatpak-runtimes.bst
+++ b/elements/flatpak-runtimes.bst
@@ -31,33 +31,34 @@ config:
   environment:
   - core-deps/flatpak.bst
   arch: '%{gcc_arch}'
+  branch: '%{flatpak-branch}'
   repo-mode: bare-user-only
   (?):
   - arch == 'i686':
       copy-refs:
-      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}/x86_64/%{branch}
-      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/x86_64/%{branch}
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{branch}
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{branch}
+      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}/x86_64/%{flatpak-branch}
+      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/x86_64/%{flatpak-branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{flatpak-branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{flatpak-branch}
 
   - arch == 'arm':
       copy-refs:
-      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}/aarch64/%{branch}
-      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/aarch64/%{branch}
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{branch}
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{branch}
+      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}/aarch64/%{flatpak-branch}
+      - src: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Platform.Compat.%{gcc_arch}.Debug/aarch64/%{flatpak-branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{flatpak-branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{flatpak-branch}
 
   - arch == 'aarch64':
       copy-refs:
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{branch}
-      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{branch}
-        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}/x86_64/%{flatpak-branch}
+      - src: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/%{gcc_arch}/%{flatpak-branch}
+        dest: runtime/org.gnome.Sdk.Compat.%{gcc_arch}.Debug/x86_64/%{flatpak-branch}
diff --git a/elements/flatpak/platform-arch-libs-debug.bst b/elements/flatpak/platform-arch-libs-debug.bst
index 7d03a670..c10309bc 100644
--- a/elements/flatpak/platform-arch-libs-debug.bst
+++ b/elements/flatpak/platform-arch-libs-debug.bst
@@ -12,5 +12,5 @@ config:
     Runtime:
       name: org.gnome.Platform.Compat.%{gcc_arch}.Debug
     ExtensionOf:
-      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{flatpak-branch}
 
diff --git a/elements/flatpak/platform-arch-libs.bst b/elements/flatpak/platform-arch-libs.bst
index 1b7392a1..91e0f18b 100644
--- a/elements/flatpak/platform-arch-libs.bst
+++ b/elements/flatpak/platform-arch-libs.bst
@@ -15,5 +15,5 @@ config:
     Runtime:
       name: org.gnome.Platform.Compat.%{gcc_arch}
     ExtensionOf:
-      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{flatpak-branch}
 
diff --git a/elements/flatpak/platform-locale.bst b/elements/flatpak/platform-locale.bst
index 072d52d8..1af11242 100644
--- a/elements/flatpak/platform-locale.bst
+++ b/elements/flatpak/platform-locale.bst
@@ -9,4 +9,4 @@ config:
       name: org.gnome.Platform.Locale
 
     ExtensionOf:
-      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{flatpak-branch}
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 5aaf11e7..db8bed68 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -19,8 +19,8 @@ config:
   metadata:
     Runtime:
       name: org.gnome.Platform
-      runtime: org.gnome.Platform/%{gcc_arch}/%{branch}
-      sdk: org.gnome.Sdk/%{gcc_arch}/%{branch}
+      runtime: org.gnome.Platform/%{gcc_arch}/%{flatpak-branch}
+      sdk: org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
 
     Environment:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
diff --git a/elements/flatpak/sdk-arch-libs-debug.bst b/elements/flatpak/sdk-arch-libs-debug.bst
index dbafa0bd..7aecacbe 100644
--- a/elements/flatpak/sdk-arch-libs-debug.bst
+++ b/elements/flatpak/sdk-arch-libs-debug.bst
@@ -12,4 +12,4 @@ config:
     Runtime:
       name: org.gnome.Sdk.Compat.%{gcc_arch}.Debug
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
diff --git a/elements/flatpak/sdk-arch-libs.bst b/elements/flatpak/sdk-arch-libs.bst
index 1d7dd509..6dad9c35 100644
--- a/elements/flatpak/sdk-arch-libs.bst
+++ b/elements/flatpak/sdk-arch-libs.bst
@@ -12,4 +12,4 @@ config:
     Runtime:
       name: org.gnome.Sdk.Compat.%{gcc_arch}
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
diff --git a/elements/flatpak/sdk-debug.bst b/elements/flatpak/sdk-debug.bst
index 7b4db59c..c715d30a 100644
--- a/elements/flatpak/sdk-debug.bst
+++ b/elements/flatpak/sdk-debug.bst
@@ -9,5 +9,5 @@ config:
       name: org.gnome.Sdk.Debug
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
 
diff --git a/elements/flatpak/sdk-docs.bst b/elements/flatpak/sdk-docs.bst
index dbf2033d..fc32fdf1 100644
--- a/elements/flatpak/sdk-docs.bst
+++ b/elements/flatpak/sdk-docs.bst
@@ -9,5 +9,5 @@ config:
       name: org.gnome.Sdk.Docs
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
 
diff --git a/elements/flatpak/sdk-locale.bst b/elements/flatpak/sdk-locale.bst
index d981a1f7..c4c9f59f 100644
--- a/elements/flatpak/sdk-locale.bst
+++ b/elements/flatpak/sdk-locale.bst
@@ -9,4 +9,4 @@ config:
       name: org.gnome.Sdk.Locale
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index b3cd258a..238176a6 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -22,8 +22,8 @@ config:
   metadata:
     Runtime:
       name: org.gnome.Sdk
-      runtime: org.gnome.Platform/%{gcc_arch}/%{branch}
-      sdk: org.gnome.Sdk/%{gcc_arch}/%{branch}
+      runtime: org.gnome.Platform/%{gcc_arch}/%{flatpak-branch}
+      sdk: org.gnome.Sdk/%{gcc_arch}/%{flatpak-branch}
 
     Environment:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
diff --git a/project.conf b/project.conf
index b2efac37..e145bfe1 100644
--- a/project.conf
+++ b/project.conf
@@ -211,6 +211,8 @@ shell:
 
 variables:
   branch: master
+  qualifier: ''
+  flatpak-branch: '%{branch}%{qualifier}'
   ostree-layer: user
   ostree-branch: "gnome-os/%{branch}/%{arch}-%{ostree-layer}"
   ostree-remote-url: "https://nightly.gnome.org/gnomeos/repo";
@@ -257,4 +259,4 @@ plugins:
   path: plugins
   elements:
     collect_initial_scripts: 0
-    ostree: 0
\ No newline at end of file
+    ostree: 0