Skip to content

Commit 5a7e9db

Browse files
thomasdraebingmsohn
authored andcommitted
Consume rbe_autoconfig as bazel module
This also changes the version of rbe_autoconfig to 5.2.0, which uses Java 21 instead of Java 17. Change-Id: I95a860fcc94d3545519db738a067f43d999fd2c5
1 parent ad382b2 commit 5a7e9db

3 files changed

Lines changed: 15 additions & 19 deletions

File tree

MODULE.bazel

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ module(name = "jgit")
22

33
bazel_dep(name = "rules_java", version = "8.11.0")
44
bazel_dep(name = "rules_jvm_external", version = "6.7")
5+
bazel_dep(name = "rbe_autoconfig")
6+
git_override(
7+
module_name = "rbe_autoconfig",
8+
remote = "https://github.com/davido/rbe_autoconfig.git",
9+
commit = "71f39817c028949bd6d25f1806502bcd33028d14",
10+
)
511

612
register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition")
713

@@ -15,18 +21,6 @@ git_repository(
1521
remote = "https://gerrit.googlesource.com/bazlets",
1622
)
1723

18-
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
19-
20-
http_archive(
21-
name = "ubuntu2204_jdk17",
22-
sha256 = "8ea82b81c9707e535ff93ef5349d11e55b2a23c62bcc3b0faaec052144aed87d",
23-
strip_prefix = "rbe_autoconfig-5.1.0",
24-
urls = [
25-
"https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v5.1.0.tar.gz",
26-
"https://github.com/davido/rbe_autoconfig/releases/download/v5.1.0/v5.1.0.tar.gz",
27-
],
28-
)
29-
3024
BOUNCYCASTLE_VERSION = "1.83"
3125

3226
BYTE_BUDDY_VERSION = "1.18.2"

MODULE.bazel.lock

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/remote-bazelrc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ build:remote --disk_cache=
3030

3131
# Set several flags related to specifying the platform, toolchain and java
3232
# properties.
33-
build:remote --crosstool_top=@ubuntu2204_jdk17//cc:toolchain
34-
build:remote --extra_toolchains=@ubuntu2204_jdk17//config:cc-toolchain
35-
build:remote --extra_execution_platforms=@ubuntu2204_jdk17//config:platform
36-
build:remote --host_platform=@ubuntu2204_jdk17//config:platform
37-
build:remote --platforms=@ubuntu2204_jdk17//config:platform
33+
build:remote --crosstool_top=@rbe_autoconfig//cc:toolchain
34+
build:remote --extra_toolchains=@rbe_autoconfig//config:cc-toolchain
35+
build:remote --extra_execution_platforms=@rbe_autoconfig//config:platform
36+
build:remote --host_platform=@rbe_autoconfig//config:platform
37+
build:remote --platforms=@rbe_autoconfig//config:platform
3838

3939
# Set various strategies so that all actions execute remotely. Mixing remote
4040
# and local execution will lead to errors unless the toolchain and remote

0 commit comments

Comments
 (0)