[gnome-build-meta/tristan/fdsdk-master-again: 1/2] flatpak-platform-extensions.bst: build extensions in a separate element

[Abderrahim Kitouni <akitouni src gnome org>]

commit e585f6de34a0f4ab2c7ff116c1be7b0fceff9df6
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Jun 25 09:58:13 2019 +0100

    flatpak-platform-extensions.bst: build extensions in a separate element
    
    This allows for different flatpak branch names between freedesktop-sdk
    and gnome-build-meta
    
    Fixes #181

 .gitlab-ci.yml                           | 20 +++++++++++++-------
 elements/flatpak-platform-extensions.bst | 24 ++++++++++++++++++++++++
 elements/flatpak-runtimes.bst            |  9 ---------
 3 files changed, 37 insertions(+), 16 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e22fb62..1e5a0004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,8 @@ before_script:
   stage: build
   dependencies: [track]
   script:
-    - ${BST} -o arch "${ARCH}" build core.bst flatpak-runtimes.bst platform-manifest.bst sdk-manifest.bst
+    - ${BST} -o arch "${ARCH}" build core.bst flatpak-runtimes.bst flatpak-platform-extensions.bst
+      platform-manifest.bst sdk-manifest.bst
   # Store all the downloaded git repos and tarballs in the cache.
   # This saves us fetching them on every build
   cache: &bst-cache
@@ -96,16 +97,21 @@ before_script:
   stage: flatpak
   dependencies: [track, flatpak-prepare]
   script:
+    - ostree init --repo repo/ --mode archive
+
     - ${BST} -o arch "${ARCH}" pull flatpak-runtimes.bst
     - ${BST} -o arch "${ARCH}" checkout --hardlinks flatpak-runtimes.bst checkout-repo/
+    - flatpak build-commit-from --src-repo=checkout-repo/ repo/
+    - rm -rf checkout-repo/
 
-    - ostree init --repo repo/ --mode archive
     - |
-      # 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)
-      esac
-    - flatpak build-commit-from --src-repo=checkout-repo/ repo/ $REFS
+      if test $FLAT_MANAGER_REPO == nightly; then
+          ${BST} -o arch "${ARCH}" pull flatpak-platform-extensions.bst
+          ${BST} -o arch "${ARCH}" checkout --hardlinks flatpak-platform-extensions.bst checkout-repo/
+          flatpak build-commit-from --src-repo=checkout-repo/ repo/
+          rm -rf checkout-repo/
+      fi
+
     - flatpak build-update-repo --generate-static-deltas repo/
 
     - flat-manager/flat-manager-client push $(cat build.txt) repo/
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
new file mode 100644
index 00000000..d8b0df73
--- /dev/null
+++ b/elements/flatpak-platform-extensions.bst
@@ -0,0 +1,24 @@
+kind: flatpak_repo
+depends:
+- filename: flatpak-images/platform-vaapi.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: flatpak-images/platform-ffmpeg-html5.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: flatpak-images/mesa.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: deploy-tools/flatpak.bst
+  junction: freedesktop-sdk.bst
+  type: build
+variables:
+  # Obtain the versions of the flatpak extensions
+  (@): freedesktop-sdk.bst:include/versions.yml
+
+config:
+  environment:
+    - deploy-tools/flatpak.bst
+  arch: '%{gcc_arch}'
+  branch: '%{freedesktop-sdk-flatpak-branch}'
+  repo-mode: bare-user-only
diff --git a/elements/flatpak-runtimes.bst b/elements/flatpak-runtimes.bst
index 57b3ff18..abdd9ce8 100644
--- a/elements/flatpak-runtimes.bst
+++ b/elements/flatpak-runtimes.bst
@@ -4,15 +4,6 @@ depends:
   type: build
 - filename: flatpak/platform-locale.bst
   type: build
-- filename: flatpak-images/platform-vaapi.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: flatpak-images/platform-ffmpeg-html5.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: flatpak-images/mesa.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: flatpak/sdk.bst
   type: build
 - filename: flatpak/sdk-debug.bst