From 2ba23f3ae45bb807d3fe4d2adde29d2229848b1e Mon Sep 17 00:00:00 2001 From: Nevena Kotlaja Date: Mon, 28 Aug 2023 12:12:07 -0700 Subject: [PATCH] Migrate Automatic Exec Groups by adding a toolchain parameter to the affected actions This is a step forward for the full migration of Automatic Exec Groups (AEGs). This change will be effective once AEGs are enabled. In this CL I've added a toolchain_type to `toolchain` attribute of ctx.actions.{run, run_shell} since the Execution platform is selected on a toolchain type level, not on a rule level like before AEGs. PiperOrigin-RevId: 560782417 --- tools/nogo/defs.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/nogo/defs.bzl b/tools/nogo/defs.bzl index 539f9280a..17eec5b49 100644 --- a/tools/nogo/defs.bzl +++ b/tools/nogo/defs.bzl @@ -91,6 +91,7 @@ def _nogo_stdlib_impl(ctx): "-facts=%s" % facts_file.path, "-root=.*?/src/", ] + [f.path for f in go_ctx.stdlib_srcs], + toolchain = None, ) # Return the stdlib facts as output. @@ -291,6 +292,7 @@ def _nogo_aspect_impl(target, ctx): "-facts=%s" % facts_file.path, "-package=%s" % importpath, ] + [src.path for src in srcs], + toolchain = None, ) # Return the package facts as output. @@ -363,6 +365,7 @@ def _nogo_test_impl(ctx): ["-config=%s" % f.path for f in config_srcs] + ["-output=%s" % findings.path] + [f.path for f in raw_findings], + toolchain = None, ) # Note that this calls the filter binary without any configuration, so