Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bazel 7 compatibility #41

Merged
merged 1 commit into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
common --config=rules
common:v5.0 --config=rules_v5.0
common:v6.3 --config=rules_v6.3
common:v7.0 --config=rules_v7.0
import %workspace%/.bazelrc_shared
3 changes: 3 additions & 0 deletions .bazelrc_shared
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
common --announce_rc
common --color=yes
common --noenable_bzlmod

build --experimental_strict_action_env
build --javacopt="-source 11 -target 11"
Expand Down Expand Up @@ -28,13 +29,15 @@ test --test_output=all

common:rules_v5.0 --config=noop
common:rules_v6.3 --config=noop
common:rules_v7.0 --config=noop

# route potentially unrouted configs to a terminating noop config
# it's a noop because we use the default value
common:rules --config=noop
common:tests --config=noop
common:v5.0 --config=rules_v5.0
common:v6.3 --config=rules_v6.3
common:v7.0 --config=rules_v7.0

# pick something trivial as a "noop"
common:noop --logging=3
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
bazel_version: [5.0.0, 6.3.2]
bazel_version: [6.3.2, 7.0.0]
steps:
- uses: actions/checkout@v3
- run: ./scripts/ci.sh build
Expand Down
15 changes: 2 additions & 13 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ http_archive(
],
)

skydoc_tag = "0.3.0"

skydoc_sha256 = "8762a212cff5f81505a1632630edcfe9adce381479a50a03c968bd2fc217972d"

http_archive(
name = "io_bazel_skydoc",
sha256 = skydoc_sha256,
strip_prefix = "skydoc-{}".format(skydoc_tag),
url = "https://github.com/bazelbuild/skydoc/archive/{}.zip".format(skydoc_tag),
)

# com_github_bazelbuild_buildtools

buildtools_tag = "0.29.0"
Expand All @@ -47,13 +36,13 @@ buildifier_dependencies()

# io_bazel_rules_go

rules_go_tag = "v0.28.0"
rules_go_tag = "v0.43.0"

rules_go_sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb"

http_archive(
name = "io_bazel_rules_go",
sha256 = rules_go_sha256,
integrity = "sha256-1qtrV+SMCVI+kwUPE2mPcIQoz9XmGSUuNp03evZZdwc=",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.zip".format(tag = rules_go_tag),
"https://github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.zip".format(tag = rules_go_tag),
Expand Down
82 changes: 0 additions & 82 deletions docs/stardoc/external.md

This file was deleted.

2 changes: 0 additions & 2 deletions docs/stardoc/jvm.md

This file was deleted.

Loading