fix: integration tests, toolchain cleanup

sgammon · Aug 19, 2023 · 0b767ed · 0b767ed
1 parent b77fcb8
commit 0b767ed
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -22,7 +22,6 @@ import %workspace%/tools/bazel/java.bazelrc
 common --color=auto
 
 build --worker_sandboxing
-build --spawn_strategy=worker,sandboxed,local
 build --verbose_failures
 
 # pick something trivial as a "noop"

diff --git a/example/integration_tests/bzlmod/MODULE.bazel.lock b/example/integration_tests/bzlmod/MODULE.bazel.lock
diff --git a/example/integration_tests/bzlmod/sample/BUILD.bazel b/example/integration_tests/bzlmod/sample/BUILD.bazel
@@ -20,6 +20,7 @@ native_image(
  name = "main-native",
  main_class = "Main",
  deps = [":java"],
+ native_image_tool = "@graalvm//:native-image",
 )
 
 alias(

diff --git a/example/integration_tests/workspace/sample/BUILD.bazel b/example/integration_tests/workspace/sample/BUILD.bazel
@@ -20,6 +20,7 @@ native_image(
  name = "main-native",
  main_class = "Main",
  deps = [":java"],
+ native_image_tool = "@graalvm//:native-image",
 )
 
 alias(

diff --git a/graalvm/nativeimage/rules.bzl b/graalvm/nativeimage/rules.bzl
@@ -14,7 +14,7 @@ load(
 
 _RULES_REPO = "@rules_graalvm"
 
-_NATIVE_IMAGE_TOOLCHAIN_TYPE = "%s//graalvm/toolchain/native_image:toolchain_type" % _RULES_REPO
+_NATIVE_IMAGE_TOOLCHAIN_TYPE = "%s//graalvm/toolchain" % _RULES_REPO
 _BAZEL_CPP_TOOLCHAIN_TYPE = "@bazel_tools//tools/cpp:toolchain_type"
 _BAZEL_CURRENT_CPP_TOOLCHAIN = "@bazel_tools//tools/cpp:current_cc_toolchain"
 

diff --git a/graalvm/toolchain/BUILD.bazel b/graalvm/toolchain/BUILD.bazel
@@ -7,6 +7,6 @@ package(default_visibility = ["//visibility:public"])
 # Describes a regular GraalVM toolchain; this type is satisfied by either GraalVM Community Edition
 # or a distribution of Oracle GraalVM.
 alias(
- name = "graalvm",
+ name = "toolchain",
  actual = "//graalvm/toolchain/gvm:toolchain_type",
 )
diff --git a/tools/bazel/labs.bazelrc b/tools/bazel/labs.bazelrc
@@ -8,6 +8,7 @@ build:labs --experimental_use_windows_sandbox=auto
 
 build:labs --incompatible_strict_action_env
 
+build:labs --spawn_strategy=worker,sandboxed,local
 build:labs --dynamic_local_strategy=worker,sandboxed,standalone
 
 build:labs-broken --experimental_worker_strict_flagfiles