Try using bazelbuild/setup-bazelisk everywhere.

This should hopefully mean that the `bazel` command found first in the path is actually Bazelisk. Revert various previous attempts to get all this working... Change-Id: I9a6267aff334de3dc55c7333d83e67ad2ad4ef05 Reviewed-on: https://code-review.googlesource.com/c/re2/+/61610 Reviewed-by: Perry Lorier <[email protected]> Reviewed-by: Paul Wankadia <[email protected]>
google · Jul 28, 2023 · 44277d2 · 44277d2
1 parent c20f76e
commit 44277d2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/.github/bazel.sh b/.github/bazel.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 set -eux
 
-bazelisk clean
-bazelisk build --compilation_mode=dbg -- //:all
-bazelisk test  --compilation_mode=dbg -- //:all \
+bazel clean
+bazel build --compilation_mode=dbg -- //:all
+bazel test  --compilation_mode=dbg -- //:all \
   -//:dfa_test \
   -//:exhaustive1_test \
   -//:exhaustive2_test \
   -//:exhaustive3_test \
   -//:exhaustive_test \
   -//:random_test
 
-bazelisk clean
-bazelisk build --compilation_mode=opt -- //:all
-bazelisk test  --compilation_mode=opt -- //:all \
+bazel clean
+bazel build --compilation_mode=opt -- //:all
+bazel test  --compilation_mode=opt -- //:all \
   -//:dfa_test \
   -//:exhaustive1_test \
   -//:exhaustive2_test \

diff --git a/.github/workflows/ci-bazel.yml b/.github/workflows/ci-bazel.yml
@@ -13,5 +13,7 @@ jobs:
       BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v3
+      # TODO(junyer): Use `v2` whenever a new release is tagged.
+      - uses: bazelbuild/setup-bazelisk@6244971d4f7ba9aca943c2f3ede2bbd813fcca51
       - run: .github/bazel.sh
         shell: bash
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -36,7 +36,7 @@ jobs:
         shell: bash
       - name: Build wheel
         run: |
-          BAZELISK="$(which bazelisk)" python setup.py bdist_wheel
+          python setup.py bdist_wheel
           python -m auditwheel repair --wheel-dir=. dist/*
         shell: bash
         working-directory: python
@@ -70,6 +70,8 @@ jobs:
       SYSTEM_VERSION_COMPAT: 0
     steps:
       - uses: actions/checkout@v3
+      # TODO(junyer): Use `v2` whenever a new release is tagged.
+      - uses: bazelbuild/setup-bazelisk@6244971d4f7ba9aca943c2f3ede2bbd813fcca51
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.ver }}
@@ -81,7 +83,7 @@ jobs:
         shell: bash
       - name: Build wheel
         run: |
-          BAZELISK="$(which bazelisk)" python setup.py bdist_wheel \
+          python setup.py bdist_wheel \
             --plat-name=macosx-${{ matrix.os }}.0-${{ matrix.arch.python-name }}
           python -m delocate.cmd.delocate_wheel --wheel-dir=. dist/*
         shell: bash
@@ -117,6 +119,8 @@ jobs:
       BAZEL_CPU: ${{ matrix.arch.bazel-name }}_windows
     steps:
       - uses: actions/checkout@v3
+      # TODO(junyer): Use `v2` whenever a new release is tagged.
+      - uses: bazelbuild/setup-bazelisk@6244971d4f7ba9aca943c2f3ede2bbd813fcca51
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.ver }}
@@ -128,7 +132,7 @@ jobs:
         shell: bash
       - name: Build wheel
         run: |
-          BAZELISK="$(which bazelisk)" python setup.py bdist_wheel \
+          python setup.py bdist_wheel \
             --plat-name=${{ matrix.arch.python-name }}
           python -m delvewheel --wheel-dir=. dist/*
         shell: bash

diff --git a/app/build.sh b/app/build.sh
@@ -4,7 +4,7 @@ set -eux
 SRCDIR=$(readlink --canonicalize $(dirname $0))
 DSTDIR=$(mktemp --directory --tmpdir $(basename $0).XXXXXXXXXX)
 
-BAZELISK=/tmp/bazelisk
+BAZEL=/tmp/bazel
 BAZELISK_RELEASE=v1.17.0
 
 if [[ ${UID} -ne 0 ]]; then
@@ -16,18 +16,18 @@ if [[ ${UID} -ne 0 ]]; then
   sudo docker run -i -t --pull always --rm -v ${SRCDIR}/..:/src -v ${PWD}:/dst emscripten/emsdk /src/app/$(basename $0)
   ls -l deploy
 else
-  wget -O ${BAZELISK} https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_RELEASE}/bazelisk-linux-amd64
-  chmod +x ${BAZELISK}
+  wget -O ${BAZEL} https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_RELEASE}/bazelisk-linux-amd64
+  chmod +x ${BAZEL}
 
   cd ${SRCDIR}
   # Emscripten doesn't support `-fstack-protector`.
   AR=emar CC=emcc \
-    ${BAZELISK} build --compilation_mode=opt \
+    ${BAZEL} build --compilation_mode=opt \
     --copt=-fno-stack-protector \
     -- :all
   cp ../bazel-bin/app/_re2.js ${DSTDIR}
   # Clean up the sundry Bazel output directories.
-  ${BAZELISK} clean --expunge
+  ${BAZEL} clean --expunge
   cp app.ts index.html _re2.d.ts ${DSTDIR}
   cp package.json rollup.config.js tsconfig.json ${DSTDIR}
 

diff --git a/python/setup.py b/python/setup.py
@@ -45,13 +45,13 @@
 class BuildExt(setuptools.command.build_ext.build_ext):
 
   def build_extension(self, ext):
-    if 'BAZELISK' not in os.environ:
+    if 'GITHUB_ACTIONS' not in os.environ:
       return super().build_extension(ext)
 
     # For @pybind11_bazel's `python_configure()`.
     os.environ['PYTHON_BIN_PATH'] = sys.executable
 
-    cmd = [os.environ['BAZELISK'], 'build']
+    cmd = ['bazel', 'build']
     if 'BAZEL_CPU' in os.environ:
       cmd.append(f'--cpu={os.environ["BAZEL_CPU"].lower()}')
     cmd += ['--compilation_mode=opt', '--', ':all']
@@ -62,7 +62,7 @@ def build_extension(self, ext):
     shutil.copyfile('../bazel-bin/python/_re2.so',
                     self.get_ext_fullpath(ext.name))
 
-    cmd = [os.environ['BAZELISK'], 'clean', '--expunge']
+    cmd = ['bazel', 'clean', '--expunge']
     self.spawn(cmd)