Swap calls to update_bazel_macos to install_bazelisk instead.

This is a small step forward in simplifying bazel setup in CI environments by
removing the complexity of boostrapping bazel. Additionally this enables testing
against a wider array of bazel releases, hopefully simplifying upgrades.

PiperOrigin-RevId: 296927589
Change-Id: I054247960c14068c4fa8151b1fda2d42797ba4ad
This commit is contained in:
Brian Atkinson 2020-02-24 10:52:37 -08:00 committed by TensorFlower Gardener
parent df6ffdf0f4
commit 2d67dbde27
29 changed files with 29 additions and 147 deletions

View File

@ -62,9 +62,7 @@ function run_build () {
}
source tensorflow/tools/ci_build/release/common.sh
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
setup_pip
run_build

View File

@ -18,7 +18,7 @@ echo "bazel clean --expunge" >> tensorflow/tools/ci_build/linux/libtensorflow.sh
# Install latest bazel
source tensorflow/tools/ci_build/release/common.sh
update_bazel_macos
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -19,5 +19,5 @@ set -x
# Install latest bazel
source tensorflow/tools/ci_build/release/common.sh
update_bazel_macos
install_bazelisk
tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
sudo xcode-select --switch /Applications/Xcode_9.2.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Install pip dependencies
install_macos_pip_deps sudo

View File

@ -17,10 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
install_bazelisk
# Pick a more recent version of xcode
sudo xcode-select --switch /Applications/Xcode_9.2.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
sudo xcode-select --switch /Applications/Xcode_9.2.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Install pip dependencies
sudo pip3.5 install --upgrade pip

View File

@ -16,10 +16,7 @@
set -e
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
install_macos_pip_deps
install_bazelisk
# For python3 path on Mac
export PATH=$PATH:/usr/local/bin

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
sudo xcode-select --switch /Applications/Xcode_9.2.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Install pip dependencies
install_macos_pip_deps sudo pip3.6

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
sudo xcode-select --switch /Applications/Xcode_9.2.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Install pip dependencies
install_macos_pip_deps sudo pip3.7

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
install_macos_pip_deps sudo pip3.7

View File

@ -17,12 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
set_bazel_outdir
install_bazelisk
# Pick a version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer

View File

@ -17,11 +17,7 @@ set -e
set -x
source tensorflow/tools/ci_build/release/common.sh
# Install latest bazel
update_bazel_macos
which bazel
bazel version
set_bazel_outdir
install_bazelisk
# Pick a more recent version of xcode
export DEVELOPER_DIR=/Applications/Xcode_10.3.app/Contents/Developer