From de7a249fcd9c7e5f3eebdee4357626d8098569d9 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Sun, 19 Jul 2020 15:04:04 +0200 Subject: [PATCH] Fix linker issues during tests with new workers --- taskcluster/.build.yml | 2 +- taskcluster/homebrew-build.sh | 9 +++++---- taskcluster/homebrew_builds-darwin-amd64.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 76fc9703..61fadf17 100644 --- 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/homebrew-build.sh b/taskcluster/homebrew-build.sh index 6cdda80a..4ddb9ad8 100755 --- 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 index d2fe03f5..f5d60902 100644 --- 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"