From: Matthew Waters <matthew@centricular.com>
Date: Thu, 28 Nov 2019 01:55:51 +0000 (+1100)
Subject: update for macos 10.15 making / read-only
X-Git-Tag: 1.19.3~497^2~270
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d153e0d7ed4ed9ff0b212116ba304d072e7d5490;p=platform%2Fupstream%2Fgstreamer.git

update for macos 10.15 making / read-only

We've moved the host cached cerbero directory to /Users/gst-ci/cerbero
instead now.
---

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index fb8f8e90e2..d08f0ae6fe 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -349,6 +349,8 @@ valgrind ges:
     HAVE_CCACHE: "yes"
     # used by macos packages as we only ever install to a fixed directory
     CERBERO_OVERRIDDEN_DIST_DIR: ""
+    # location where cerbero is cached on the host
+    CERBERO_HOST_DIR: "/cerbero/"
   before_script:
     # FIXME Wrong namespace
     # Workaround build-tools having hardcoded internal path
@@ -357,7 +359,7 @@ valgrind ges:
     - ln -sf $(pwd) ../../gstreamer/cerbero
     - mkdir -p ../../${CI_PROJECT_NAMESPACE}
     - ln -sf $(pwd) ../../${CI_PROJECT_NAMESPACE}/cerbero
-    - rsync -aH /cerbero/ .
+    - rsync -aH ${CERBERO_HOST_DIR} .
     - test -f ${CERBERO_DEPS} && tar -C ${CERBERO_HOME} -xf ${CERBERO_DEPS}
     - echo "home_dir = \"$(pwd)/${CERBERO_HOME}\"" >> localconf.cbc
     - echo "local_sources = \"$(pwd)/${CERBERO_SOURCES}\"" >> localconf.cbc
@@ -737,8 +739,9 @@ cerbero deps macos x86_64:
     CONFIG: "osx-x86-64.cbc"
     HAVE_CCACHE: ""
     CERBERO_OVERRIDDEN_DIST_DIR: "/Library/Frameworks/GStreamer.framework/Versions/1.0"
+    CERBERO_HOST_DIR: "/Users/gst-ci/cerbero/"
   tags:
-    - gst-macos-10.14
+    - gst-macos-10.15
 
 .cerbero macos x86_64:
   extends: '.cerbero'
@@ -748,8 +751,9 @@ cerbero deps macos x86_64:
     CERBERO_PACKAGE_ARGS: ""
     HAVE_CCACHE: ""
     CERBERO_OVERRIDDEN_DIST_DIR: "/Library/Frameworks/GStreamer.framework/Versions/1.0"
+    CERBERO_HOST_DIR: "/Users/gst-ci/cerbero/"
   tags:
-    - gst-macos-10.14
+    - gst-macos-10.15
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
     expire_in: '5 days'
@@ -793,8 +797,9 @@ cerbero deps cross-ios universal:
     CONFIG: "cross-ios-universal.cbc"
     CERBERO_ARGS: "${DEFAULT_CERBERO_ARGS} -v nowerror"
     HAVE_CCACHE: ""
+    CERBERO_HOST_DIR: "/Users/gst-ci/cerbero/"
   tags:
-    - gst-ios-12.2
+    - gst-ios-13.2
 
 .cerbero cross-ios universal:
   extends: '.cerbero'
@@ -804,8 +809,9 @@ cerbero deps cross-ios universal:
     CERBERO_ARGS: "${DEFAULT_CERBERO_ARGS} -v nowerror"
     CERBERO_PACKAGE_ARGS: ""
     HAVE_CCACHE: ""
+    CERBERO_HOST_DIR: "/Users/gst-ci/cerbero/"
   tags:
-    - gst-ios-12.2
+    - gst-ios-13.2
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
     expire_in: '5 days'
@@ -908,7 +914,7 @@ documentation:
   after_script:
     - rm -rf ${EXAMPLES_HOME}/gst-examples ${EXAMPLES_HOME}/gst-docs
   tags:
-    - gst-ios-12.2
+    - gst-ios-13.2
 
 cross-ios universal examples:
   extends: ".cross-ios universal examples"