Skip to content

Commit

Permalink
Merge pull request #66 from tweag/cg/upgrade_bazel
Browse files Browse the repository at this point in the history
chore: upgrade Bazel to 7.0.0rc5
  • Loading branch information
mergify[bot] authored Dec 11, 2023
2 parents 99786b2 + f7928c2 commit 88ac422
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USE_BAZEL_VERSION=5.3.0
USE_BAZEL_VERSION=7.0.0rc5
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-2019]
bazel_mode: [workspace, module]
version: ["5.3.0", "6.0.0"]
version: ["5.3.0", "6.0.0", "7.0.0rc5"]
exclude:
- version: 5.3.0
bazel_mode: module
Expand Down
7 changes: 4 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module(
version = "0.3.0",
compatibility_level = 0,
)

bazel_dep(name = "bazel_skylib", version = "1.2.1")
bazel_dep(name = "platforms", version = "0.0.5")
bazel_dep(name = "stardoc", version = "0.5.1", repo_name = "io_bazel_stardoc", dev_dependency = True)
bazel_dep(name = "platforms", version = "0.0.8")

sh_configure = use_extension("//bzlmod:extensions.bzl", "sh_configure")
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")

sh_configure = use_extension("//bzlmod:extensions.bzl", "sh_configure")
use_repo(sh_configure, "local_posix_config", "rules_sh_shim_exe")

register_toolchains("@local_posix_config//...")
7 changes: 4 additions & 3 deletions sh/posix.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,16 @@ toolchain(
if cmd_path
]),
arch = {
"darwin_arm64": "arm64",
"arm64_windows": "arm64",
"aarch64": "arm64",
"arm64_windows": "arm64",
"darwin_arm64": "arm64",
}.get(cpu, "x86_64"),
os = {
"arm64_windows": "windows",
"darwin": "osx",
"darwin_arm64": "osx",
"darwin_x86_64": "osx",
"x64_windows": "windows",
"arm64_windows": "windows",
}.get(cpu, "linux"),
toolchain_type = TOOLCHAIN_TYPE,
))
Expand Down

0 comments on commit 88ac422

Please sign in to comment.