Have ci use vendored bazelisk script.

zemn-me · Jan 23, 2025 · 6777d3b · 6777d3b
1 parent 5be4470
commit 6777d3b
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ on:   # yamllint disable-line rule:truthy
   # manual triggering
   workflow_dispatch:
 
+env:
+  BAZEL: ./sh/bin/bazel
 
 jobs:
   Presubmit:
@@ -64,10 +66,10 @@ jobs:
         run: |
          ./.github/workflows/prepare_ci.sh && \
          echo "::group::Presubmit prep" && \
-         bazel build --config=ci --tool_tag=presubmit //ci:presubmit && \
+         $BAZEL build --config=ci --tool_tag=presubmit //ci:presubmit && \
          echo "::endgroup::" && \
          echo "::group::Presubmit" && \
-         bazel run --config=ci --tool_tag=presubmit //ci:presubmit -- --skip-pulumi-deploy && \
+         $BAZEL run --config=ci --tool_tag=presubmit //ci:presubmit -- --skip-pulumi-deploy && \
          echo "::endgroup::"
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -107,10 +109,10 @@ jobs:
             echo "::group::Presubmit prep" && \
             test -f ./.github/workflows/prepare_ci.sh && \
             ./.github/workflows/prepare_ci.sh && \
-            bazel build --config=ci --tool_tag=staging //ci:presubmit && \
+            $BAZEL build --config=ci --tool_tag=staging //ci:presubmit && \
             echo "::endgroup::" && \
             echo "::group::Presubmit" && \
-            bazel run --config=ci --tool_tag=staging //ci:presubmit -- --skip-bazel-tests --dirty \
+            $BAZEL run --config=ci --tool_tag=staging //ci:presubmit -- --skip-bazel-tests --dirty \
             --dangerously-skip-pnpm-lockfile-validation --overwrite && \
             echo "::endgroup::"
         env:
@@ -124,7 +126,7 @@ jobs:
         # we can run this dirty since the next run will --overwrite anyway
         run: |
          ./.github/workflows/prepare_ci.sh
-         bazel run --tool_tag=staging //ci:presubmit -- \
+         $BAZEL run --tool_tag=staging //ci:presubmit -- \
          --skip-bazel-tests \
          --dangerously-skip-pnpm-lockfile-validation --dirty
         env:
@@ -153,10 +155,10 @@ jobs:
       # https://github.com/actions/cache/blob/04f198bf0b2a39f7230a4304bf07747a0bddf146/examples.md
       - name: Submit
         # Use npx to try to generate only
-        # bazel generated node_modules
+        # $BAZEL generated node_modules
         run: |
           ./.github/workflows/prepare_ci.sh
-          bazel run --config=ci --tool_tag=submit //ci:submit
+          $BAZEL run --config=ci --tool_tag=submit //ci:submit
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -186,7 +188,7 @@ jobs:
   #     - name: Postsubmit
   #       run: |
   #         ./.github/workflows/prepare_ci.sh
-  #         bazel run //ci:postsubmit
+  #         $BAZEL run //ci:postsubmit
   #       env:
   #         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   #         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}