diff --git a/.github/workflows/make_wheel_macOS.sh b/.github/workflows/make_wheel_macOS.sh index f3731cbbb4..8ffb8e9c57 100644 --- a/.github/workflows/make_wheel_macOS.sh +++ b/.github/workflows/make_wheel_macOS.sh @@ -5,7 +5,6 @@ export TF_NEED_CUDA=0 python --version python -m pip install delocate wheel setuptools tensorflow==$TF_VERSION -bash tools/install_deps/bazel_macos.sh $BAZEL_VERSION bash tools/testing/build_and_run_tests.sh bazel build \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5b794edee..034539e161 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ on: - r* env: - BAZEL_VERSION: 1.1.0 + BAZEL_VERSION: '1.1.0' MIN_PY_VERSION: '3.5' MAX_PY_VERSION: '3.8' @@ -54,6 +54,10 @@ jobs: - if: github.event_name == 'push' run: echo "::set-env name=NIGHTLY_FLAG::--nightly" - uses: actions/checkout@v2 + - uses: jwlawson/actions-setup-bazel@v1.0 + with: + bazel-version: ${{ env.BAZEL_VERSION}} + github-api-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-python@v1 with: python-version: ${{ matrix.py-version }} diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 96fef5890c..e2d92eef80 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -23,7 +23,7 @@ RUN mv /usr/bin/lsb_release2 /usr/bin/lsb_release ARG PY_VERSION RUN ln -sf $(which python$PY_VERSION) /usr/bin/python -RUN python -m pip install --upgrade pip setuptools auditwheel==2.0.0 +RUN python -m pip install auditwheel==2.0.0 ARG TF_VERSION RUN python -m pip install tensorflow==$TF_VERSION diff --git a/tools/install_deps/bazel_macos.sh b/tools/install_deps/bazel_macos.sh deleted file mode 100644 index b9c113b276..0000000000 --- a/tools/install_deps/bazel_macos.sh +++ /dev/null @@ -1,4 +0,0 @@ -set -e -x -wget --quiet -nc https://github.com/bazelbuild/bazel/releases/download/${1}/bazel-${1}-installer-darwin-x86_64.sh -chmod +x bazel-${1}-installer-darwin-x86_64.sh -./bazel-${1}-installer-darwin-x86_64.sh --user