motiejus
/
jgit
1
Fork 0
Code Releases Activity

Bazel: Fix remote build execution for Java 17 

Bazel build and test with remote17 configuration was actually executed
locally, and not remotely.

Rename remote configuration setting for Java 11 from remote to remote11
and derive the common remote configuration settings for remote11 and
remote17 configurations.

Also remove deprecated --host_javabase and --javabase options.

Test Plan:

Verify that the remote build for Java 17 is actually executed remotely:

  $ bazel test --config=remote17 --remote_instance_name=$PROJECT_NAME \
    org.eclipse.jgit.test/...

Change-Id: I10ad8c1d28c92fed9e465c2d36770ed4fb2940c3
motiejus-detectSymlinkSupport
David Ostrovsky 2023-05-25 08:49:44 +02:00 committed by David Ostrovsky
parent f4eb38f9fe
commit a80130d655
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.bazelrc
View File

@ -11,10 +11,11 @@ build --tool_java_language_version=11
build --tool_java_runtime_version=remotejdk_11
# Builds and executes on RBE using remotejdk_11
build:remote --java_language_version=11
build:remote --java_runtime_version=remotejdk_11
build:remote --tool_java_language_version=11
build:remote --tool_java_runtime_version=remotejdk_11
build:remote11 --java_language_version=11
build:remote11 --java_runtime_version=remotejdk_11
build:remote11 --tool_java_language_version=11
build:remote11 --tool_java_runtime_version=remotejdk_11
build:remote11 --config=remote
# Builds using remote_jdk17, executes using remote_jdk11 or local_jdk
build:java17 --java_language_version=17
@ -27,6 +28,7 @@ build:remote17 --java_language_version=17
build:remote17 --java_runtime_version=remotejdk_17
build:remote17 --tool_java_language_version=17
build:remote17 --tool_java_runtime_version=remotejdk_17
build:remote17 --config=remote
test --build_tests_only
test --test_output=errors

2
tools/remote-bazelrc
View File

@ -30,8 +30,6 @@ build:remote --disk_cache=
# Set several flags related to specifying the platform, toolchain and java
# properties.
build:remote --host_javabase=@rbe_jdk11//java:jdk
build:remote --javabase=@rbe_jdk11//java:jdk
build:remote --crosstool_top=@rbe_jdk11//cc:toolchain
build:remote --extra_toolchains=@rbe_jdk11//config:cc-toolchain
build:remote --extra_execution_platforms=@rbe_jdk11//config:platform