Add a .bazelversion file and use bazelisk

tweag · Dec 22, 2023 · e762cbd · e762cbd
1 parent 7115aad
commit e762cbd
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 88 deletions.
diff --git a/.ci/bazelversion → .bazelversion b/.ci/bazelversion → .bazelversion
diff --git a/.ci/bazel-6.4.0-darwin-x86_64.sha256 b/.ci/bazel-6.4.0-darwin-x86_64.sha256
diff --git a/.ci/bazel-6.4.0-linux-x86_64.sha256 b/.ci/bazel-6.4.0-linux-x86_64.sha256
diff --git a/.ci/bazel-6.4.0-windows-x86_64.exe.sha256 b/.ci/bazel-6.4.0-windows-x86_64.exe.sha256
diff --git a/.ci/check-bazel-version b/.ci/check-bazel-version
diff --git a/.ci/fetch-bazel-bindist b/.ci/fetch-bazel-bindist
diff --git a/.ci/update-bazel-version b/.ci/update-bazel-version
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -99,11 +99,6 @@ jobs:
           EOF
           cp .bazelrc.local rules_haskell_nix
           cp .bazelrc.local rules_haskell_tests
-      - name: Check Bazel version
-        uses: tweag/run-nix-shell@v0
-        with:
-          options: ${{ env.NIX_SHELL_ARGS }}
-          run: .ci/check-bazel-version
       - name: Build & test - rules_haskell
         if: matrix.module == 'rules_haskell'
         uses: tweag/run-nix-shell@v0
@@ -178,12 +173,6 @@ jobs:
         with:
           path: ~/repo-cache
           key: repo-cache-${{ runner.os }}-bindist-${{ env.cache-version }}
-      - name: Install Bazel
-        shell: bash
-        run: |
-          BAZEL_DIR="$(.ci/fetch-bazel-bindist)"
-          mv $BAZEL_DIR $HOME/bazel
-          echo "$HOME/bazel" >> "$GITHUB_PATH"
       - uses: tweag/configure-bazel-remote-cache-auth@v0
         with:
           buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -228,7 +217,7 @@ jobs:
         shell: bash
         run: |
           # Quote the package specifier so that it works on Windows
-          bazel test "//..."
+          bazelisk test "//..."
 
       - name: Build & test - rules_haskell_tests
         if: matrix.module == 'rules_haskell_tests'
@@ -237,11 +226,11 @@ jobs:
           cd rules_haskell_tests
           ./tests/run-start-script.sh --use-bindists --with-bzlmod=${{ matrix.bzlmod }}
           # Quote the package specifier so that it works on Windows
-          bazel test "//..."
+          bazelisk test "//..."
           # Test stack_snapshot pinning
           # NOTE keep in sync with tests/RunTests.hs
-          bazel run @stackage-pinning-test-unpinned//:pin
-          bazel build @stackage-pinning-test//:hspec
+          bazelisk run @stackage-pinning-test-unpinned//:pin
+          bazelisk build @stackage-pinning-test//:hspec
 
       - name: Collect Logs
         id: collect_logs
@@ -254,7 +243,7 @@ jobs:
           else
              dir=.
           fi
-          base=$( cd "$dir" ; bazel info output_base )
+          base=$( cd "$dir" ; bazelisk info output_base )
           find "$base" -mindepth 1 -maxdepth 1 -name "java*.log.*" -print0 | xargs -0rI % cp % logs/
 
       - name: Upload Logs

diff --git a/rules_haskell_nix/.bazelversion b/rules_haskell_nix/.bazelversion
@@ -0,0 +1 @@
+../.bazelversion
diff --git a/rules_haskell_tests/.bazelversion b/rules_haskell_tests/.bazelversion
@@ -0,0 +1 @@
+../.bazelversion