[gnome-build-meta/valentindavid/publish-vm-ostree: 12/12] Merge branch 'valentindavid/publish-vm-ostree-clean' into valentindavid/publish-vm-ostree

[Valentin David <valentindavid src gnome org>]

commit ffa164f96696f290b6509a6c530bf982a14e8324
Merge: 9c21531b eb1405fb
Author: Valentin David <valentin david codethink co uk>
Date:   Tue Jul 21 12:39:01 2020 +0200

    Merge branch 'valentindavid/publish-vm-ostree-clean' into valentindavid/publish-vm-ostree

 .gitlab-ci.yml                          | 74 ++++++++++++++++++++++++++++-----
 elements/core-deps/espeak.bst           |  2 +-
 elements/core-deps/portaudio.bst        |  6 +++
 elements/core-deps/tracker-miners-2.bst |  1 +
 elements/core-deps/tracker-miners.bst   |  1 +
 elements/sdk/tracker.bst                |  2 +-
 elements/vm/common-deps.bst             |  1 -
 fdsdk-firmware.patch                    | 13 ------
 8 files changed, 74 insertions(+), 26 deletions(-)
---
diff --cc .gitlab-ci.yml
index abbd3c5f,148b6298..8ab8e116
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -166,36 -165,34 +165,63 @@@ default
    - if: $EMERGENCY || $BST_TRACK_TAGS != "False"
      when: never
    - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
+   needs:
+   - track
+   - flatpak-prepare
+ 
+ .ostree-template:
+   stage: publish
+   script:
+   - export REPO_TOKEN=$OSTREE_REPO_TOKEN
+ 
+   - ostree init --repo repo/ --mode archive
+ 
+   - ${BST} -o arch "${ARCH}" build vm/repo.bst vm/repo-devel.bst
+ 
+   - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/repo.bst checkout-repo/
+   - ostree pull-local --repo=repo/ checkout-repo/
+   - rm -rf checkout-repo/
+ 
+   - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/repo-devel.bst checkout-devel-repo/
+   - ostree pull-local --repo=repo/ checkout-devel-repo/
+   - rm -rf checkout-devel-repo/
+ 
+   - flat-manager-client push $(cat build.txt) repo/ $(ostree --repo=repo/ refs)
+   rules: &ostree-publish-rules
+   - if: $CI_COMMIT_REF_NAME == "master"
+   needs:
+   - track
+   - ostree-prepare
  
 +.ostree-template:
 +  stage: publish
 +  dependencies: [track, ostree-prepare]
 +  script:
 +  - export REPO_TOKEN=$OSTREE_REPO_TOKEN
 +
 +  - ostree init --repo repo/ --mode archive
 +
 +  - ${BST} -o arch "${ARCH}"  build vm/repo.bst vm/repo-devel.bst
 +  #In strict mode, this should work instead
 +  #- ${BST} -o arch "${ARCH}" pull vm/repo.bst vm/repo-devel.bst
 +
 +  - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/repo.bst checkout-repo/
 +  - ostree --repo=checkout-repo/ refs
 +  - ostree pull-local --repo=repo/ checkout-repo/
 +  - rm -rf checkout-repo/
 +
 +  - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/repo-devel.bst checkout-devel-repo/
 +  - ostree --repo=checkout-devel-repo/ refs
 +  - ostree pull-local --repo=repo/ checkout-devel-repo/
 +  - rm -rf checkout-devel-repo/
 +
 +  - ostree --repo=repo/ refs
 +  - flat-manager-client push $(cat build.txt) repo/ $(ostree --repo=repo/ refs)
 +
 +  rules: &ostree-publish-rules
 +  - if: $CI_COMMIT_REF_NAME == "master"
 +  - if: $CI_COMMIT_REF_NAME == "valentindavid/publish-vm-ostree" && $CI_MERGE_REQUEST_ID == null
 +
  #
  # Architecture specific settings
  #
@@@ -410,9 -426,7 +454,8 @@@ flatpak-finish-failed
  
  ostree-finish:
    stage: finish_publish
-   dependencies: [ostree-prepare]
    script:
 +  - ls -l build.txt
    - export REPO_TOKEN=$OSTREE_REPO_TOKEN
    - flat-manager-client commit --wait $(cat build.txt)
    - flat-manager-client publish --wait $(cat build.txt)
@@@ -429,8 -448,12 +477,14 @@@ ostree-finish-failed
    rules:
    - if: $CI_COMMIT_REF_NAME == "master"
      when: on_failure
 +  - if: $CI_COMMIT_REF_NAME == "valentindavid/publish-vm-ostree" && $CI_MERGE_REQUEST_ID == null
 +    when: on_failure
+   needs:
+   - ostree-prepare
+   #- job: ostree-aarch64
+   #  artifacts: false
+   - job: ostree-x86_64
+     artifacts: false
    <<: *x86_64
  
  cve_report: