[gnome-build-meta/abderrahim/openh264: 2/2] .gitlab-ci.yml: add a job to mirror openh264

[Marge Bot <marge-bot src gnome org>]

commit ab0dcb7c30c0e785d3856b0533d28f4aa8a63320
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Jul 13 16:19:37 2021 +0100

    .gitlab-ci.yml: add a job to mirror openh264
    
    This allows removing the openh264 junction which can cause problems,
    as explained by Valentin David:
    
    "BuildStream does not allow two junctions to use the same project name.
    There is a conflict between Freedesktop SDK used by gnome-build-meta
    (20.08) and Freedesktop SDK used by openh264-extension (19.08)."
    
    "Using a junction for openh264-extension would rebuild it using a
    different Freedesktop SDK, which might not contain the elements it
    needs. For example it will stop building with Freedestkop SDK 21.08."
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1200>

 .gitlab-ci.yml                  | 24 ++++++++++++++++++++++--
 elements/openh264-extension.bst | 10 ----------
 junction.refs                   |  2 --
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c12baf9f..509cea93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,6 @@ default:
          ;;
       x86_64)
          TARGETS+=(vm/repo.bst vm/repo-devel.bst)
-         TARGETS+=(openh264-extension.bst:flatpak-repo.bst)
          ;;
     esac
 
@@ -192,7 +191,6 @@ generate-deploy-config:
       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: '$ENVIRONMENT_NAME'
 
     END
@@ -314,6 +312,27 @@ s3-image:
   - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"
   - if: $CI_COMMIT_TAG
 
+openh264-x86_64:
+  extends:
+  - .x86_64
+  stage: deploy
+  needs: []
+  rules:
+  - if: $EMERGENCY || $BST_TRACK_TAGS != "false"
+    when: never
+  - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"
+    when: manual
+  script:
+  - git clone https://gitlab.com/freedesktop-sdk/openh264-extension.git
+  - cd openh264-extension
+  - bst build flatpak-repo.bst
+  - bst checkout flatpak-repo.bst repo
+  - BUILD_ID=$(flat-manager-client create https://nightly.gnome.org/ nightly)
+  - flat-manager-client push --commit --publish --wait $BUILD_ID repo/ $(ostree --repo=repo/ refs) || 
result=$?
+  - flat-manager-client purge $BUILD_ID
+  - exit $result
+
+
 s3-image-static:
   extends: .x86_64
   stage: reports
@@ -346,6 +365,7 @@ ostree-x86_64:
   - job: 'build-x86_64'
     artifacts: false
 
+
 cve_report:
   extends: .x86_64
   stage: reports
diff --git a/junction.refs b/junction.refs
index 9a14d1d2..4acf2d69 100644
--- a/junction.refs
+++ b/junction.refs
@@ -2,5 +2,3 @@ projects:
   gnome:
     freedesktop-sdk.bst:
     - ref: freedesktop-sdk-20.08.14-0-g2a596987c94d848f3cf901c34f7be1a66dffaeff
-    openh264-extension.bst:
-    - ref: openh264-2.0.0-4-0-g7191bc88fbeed3ac842543706f856cb6dde99bc9