Add support for Bazel 6

tweag · Feb 9, 2023 · 5613f15 · 5613f15
1 parent 25e6d80
commit 5613f15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -9,6 +9,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         bzlmod: [workspace, module]
+        version: ["5.3.0", "6.x"]
     defaults:
       run:
         shell: bash
@@ -44,6 +45,8 @@ jobs:
           	build --experimental_enable_bzlmod
           	EOF
           fi
+
+          cat "${{ matrix.version }}" > .bazeliskrc
       - name: Build & Test
         run: |
           if [[ ${{ runner.os }} == Windows ]]; then

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/**/bazel-*
diff --git a/tests/sh_binaries/sh_binaries_test.bzl b/tests/sh_binaries/sh_binaries_test.bzl
@@ -916,7 +916,7 @@ def _windows_strip_exe_test_impl(ctx):
 windows_strip_exe_test = analysistest.make(
     _windows_strip_exe_test_impl,
     config_settings = {
-        "//command_line_option:platforms": "//tests/sh_binaries:windows",
+        "//command_line_option:platforms": str(Label("//tests/sh_binaries:windows")),
     },
     # TODO[AH] The target_under_test should be provided in the exec
     # configuration to be sure that the Windows platform check considers the
@@ -958,7 +958,7 @@ def _linux_keep_exe_test_impl(ctx):
 linux_keep_exe_test = analysistest.make(
     _linux_keep_exe_test_impl,
     config_settings = {
-        "//command_line_option:platforms": "//tests/sh_binaries:linux",
+        "//command_line_option:platforms": str(Label("//tests/sh_binaries:linux")),
     },
     # TODO[AH] The target_under_test should be provided in the exec
     # configuration to be sure that the Windows platform check considers the