From ab5c501b871b73b6d81728ea8e8b833d087b9619 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Thu, 29 Jul 2021 22:41:06 +1000
Subject: gitlab: fix incorrect build-tools path being used on macOS

The relevant CI log

dyld: Library not loaded: /Users/gst-ci/builds/gstreamer/cerbero/cerbero-build/dist/darwin_universal/x86_64/lib/liborc-0.4.0.dylib
  Referenced from: /Users/gst-ci/builds/xhaakon/gstreamer-sharp/cerbero-build/dist/darwin_universal/x86_64/bin/orcc
  Reason: image not found

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/410>
---
 gitlab/ci_template.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index d70530f..5578108 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -1146,6 +1146,16 @@ build cerbero cross-macos universal:
   extends:
     - '.cerbero'
     - '.cerbero cross-macos universal'
+  script:
+    # We have build-tools that have fixed paths pointing to the upstream
+    # repository.  We need to point
+    - pwd
+    - mkdir -p "../../gstreamer"
+    - ln -sf "$(pwd)" "../../gstreamer/cerbero"
+    - mkdir -p "../../${CI_PROJECT_NAMESPACE}"
+    - ln -sf "$(pwd)" "../../${CI_PROJECT_NAMESPACE}/cerbero"
+
+    - ./cerbero_setup.sh cerbero_deps_script
   rules:
     - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gst-sharp|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
 
-- 
cgit v1.2.3