Fix linker issues during tests with new workers

mozilla · Jul 19, 2020 · 9eb290c · 9eb290c
1 parent 8ce276e
commit 9eb290c
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 30 deletions.
diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
@@ -25,7 +25,7 @@ build:
   nc_asset_name: 'native_client.tar.xz'
   args:
     tests_cmdline: ''
-  tensorflow_git_desc: 'TensorFlow: v2.2.0-16-gfc46411'
+  tensorflow_git_desc: 'TensorFlow: v2.2.0-17-g0854bb5'
   test_model_task: ''
   homebrew:
     url: ''

diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
@@ -68,11 +68,11 @@ system:
     url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.7/artifacts/public/node-gyp-cache.tar.gz'
     namespace: 'project.deepspeech.node-gyp-cache.7'
   homebrew_builds:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_builds.7/artifacts/public/homebrew_builds.tar.gz'
-    namespace: 'project.deepspeech.homebrew_builds.7'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_builds.8/artifacts/public/homebrew_builds.tar.gz'
+    namespace: 'project.deepspeech.homebrew_builds.8'
   homebrew_tests:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_tests.8/artifacts/public/homebrew_tests.tar.gz'
-    namespace: 'project.deepspeech.homebrew_tests.8'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_tests.9/artifacts/public/homebrew_tests.tar.gz'
+    namespace: 'project.deepspeech.homebrew_tests.9'
   android_cache:
     arm64_v8a:
       android_24:

diff --git a/taskcluster/homebrew-build.sh b/taskcluster/homebrew-build.sh
@@ -42,12 +42,13 @@ do_prepare_homebrew()
 
   check_homebrew "${_brew_instance}"
 
-  # Force an upgrade to fetch formulae
-  brew search openssl
-
   # Then we force onto a specific well-known commit
+  mkdir -p "$(brew --prefix)/Library/Taps/homebrew/homebrew-core"
   pushd "$(brew --prefix)/Library/Taps/homebrew/homebrew-core"
-    git fetch origin && git checkout ${BREW_FORMULAS_COMMIT}
+    git init
+    git remote add origin https://github.com/Homebrew/homebrew-core.git
+    git fetch origin
+    git checkout ${BREW_FORMULAS_COMMIT}
   popd
 }
 

diff --git a/taskcluster/homebrew_builds-darwin-amd64.yml b/taskcluster/homebrew_builds-darwin-amd64.yml
@@ -9,4 +9,4 @@ build:
     package: "taskcluster/homebrew-package.sh --builds"
   metadata:
     name: "Builds Homebrew macOS AMD64"
-    description: "Setup a buildsl Homebrew for macOS/AMD64"
+    description: "Setup a builds Homebrew for macOS/AMD64"
diff --git a/taskcluster/tc-cpp-ds-tests-prod.sh b/taskcluster/tc-cpp-ds-tests-prod.sh
@@ -17,10 +17,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
-if [ "${OS}" = "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$TESTS_BREW/lib/:$DYLD_LIBRARY_PATH
-fi;
-
 check_versions
 
 run_prod_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-cpp-ds-tests.sh b/taskcluster/tc-cpp-ds-tests.sh
@@ -11,10 +11,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
-if [ "${OS}" = "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$TESTS_BREW/lib/:$DYLD_LIBRARY_PATH
-fi;
-
 check_versions
 
 run_all_inference_tests

diff --git a/taskcluster/tc-cpp_tflite-ds-tests.sh b/taskcluster/tc-cpp_tflite-ds-tests.sh
@@ -16,10 +16,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
-if [ "${OS}" = "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$TESTS_BREW/lib/:$DYLD_LIBRARY_PATH
-fi;
-
 check_versions
 
 run_all_inference_tests

diff --git a/taskcluster/tc-cpp_tflite-tests-prod.sh b/taskcluster/tc-cpp_tflite-tests-prod.sh
@@ -18,10 +18,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
-if [ "${OS}" = "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$TESTS_BREW/lib/:$DYLD_LIBRARY_PATH
-fi;
-
 check_versions
 
 run_prodtflite_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh
@@ -16,10 +16,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
-if [ "${OS}" = "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$TESTS_BREW/lib/:$DYLD_LIBRARY_PATH
-fi;
-
 check_versions
 
 run_tflite_basic_inference_tests