Skip to content

Commit f39454f

Browse files
fmeumcopybara-github
fmeum
authored and
copybara-github
committed
Add dev_dependency to register_{execution_platforms,toolchains}
Fixes bazelbuild#18248 Closes bazelbuild#18253. PiperOrigin-RevId: 527858646 Change-Id: I544694bb55f466bd6e14660ae62f2d535c283563
1 parent 40cf855 commit f39454f

File tree

3 files changed

+45
-4
lines changed

3 files changed

+45
-4
lines changed

‎src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,27 @@ public void bazelDep(
350350
+ " selected. Should be absolute target patterns (ie. beginning with either"
351351
+ " <code>@</code> or <code>//</code>). See <a href=\"${link toolchains}\">toolchain"
352352
+ " resolution</a> for more information.",
353+
parameters = {
354+
@Param(
355+
name = "dev_dependency",
356+
doc =
357+
"If true, the execution platforms will not be registered if the current module is"
358+
+ " not the root module or `--ignore_dev_dependency` is enabled.",
359+
named = true,
360+
positional = false,
361+
defaultValue = "False"),
362+
},
353363
extraPositionals =
354364
@Param(
355365
name = "platform_labels",
356366
allowedTypes = {@ParamType(type = Sequence.class, generic1 = String.class)},
357367
doc = "The labels of the platforms to register."))
358-
public void registerExecutionPlatforms(Sequence<?> platformLabels) throws EvalException {
368+
public void registerExecutionPlatforms(boolean devDependency, Sequence<?> platformLabels)
369+
throws EvalException {
359370
hadNonModuleCall = true;
371+
if (ignoreDevDeps && devDependency) {
372+
return;
373+
}
360374
module.addExecutionPlatformsToRegister(
361375
checkAllAbsolutePatterns(platformLabels, "register_execution_platforms"));
362376
}
@@ -368,13 +382,27 @@ public void registerExecutionPlatforms(Sequence<?> platformLabels) throws EvalEx
368382
+ " Should be absolute target patterns (ie. beginning with either <code>@</code> or"
369383
+ " <code>//</code>). See <a href=\"${link toolchains}\">toolchain resolution</a> for"
370384
+ " more information.",
385+
parameters = {
386+
@Param(
387+
name = "dev_dependency",
388+
doc =
389+
"If true, the toolchains will not be registered if the current module is not the"
390+
+ " root module or `--ignore_dev_dependency` is enabled.",
391+
named = true,
392+
positional = false,
393+
defaultValue = "False"),
394+
},
371395
extraPositionals =
372396
@Param(
373397
name = "toolchain_labels",
374398
allowedTypes = {@ParamType(type = Sequence.class, generic1 = String.class)},
375399
doc = "The labels of the toolchains to register."))
376-
public void registerToolchains(Sequence<?> toolchainLabels) throws EvalException {
400+
public void registerToolchains(boolean devDependency, Sequence<?> toolchainLabels)
401+
throws EvalException {
377402
hadNonModuleCall = true;
403+
if (ignoreDevDeps && devDependency) {
404+
return;
405+
}
378406
module.addToolchainsToRegister(
379407
checkAllAbsolutePatterns(toolchainLabels, "register_toolchains"));
380408
}

‎src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,18 +341,21 @@ public void testRegisteredExecutionPlatforms_bzlmod() throws Exception {
341341
scratch.overwriteFile(
342342
"MODULE.bazel",
343343
"register_execution_platforms('//:plat')",
344+
"register_execution_platforms('//:dev_plat',dev_dependency=True)",
344345
"bazel_dep(name='bbb',version='1.0')",
345346
"bazel_dep(name='ccc',version='1.1')");
346347
registry
347348
.addModule(
348349
createModuleKey("bbb", "1.0"),
349350
"module(name='bbb',version='1.0')",
350351
"register_execution_platforms('//:plat')",
352+
"register_execution_platforms('//:dev_plat',dev_dependency=True)",
351353
"bazel_dep(name='ddd',version='1.0')")
352354
.addModule(
353355
createModuleKey("ccc", "1.1"),
354356
"module(name='ccc',version='1.1')",
355357
"register_execution_platforms('//:plat')",
358+
"register_execution_platforms('//:dev_plat',dev_dependency=True)",
356359
"bazel_dep(name='ddd',version='1.1')")
357360
// [email protected] is not selected
358361
.addModule(
@@ -371,7 +374,8 @@ public void testRegisteredExecutionPlatforms_bzlmod() throws Exception {
371374
moduleRoot.getRelative(repo).getRelative("BUILD").getPathString(),
372375
"platform(name='plat')");
373376
}
374-
scratch.overwriteFile("BUILD", "platform(name='plat');platform(name='wsplat')");
377+
scratch.overwriteFile(
378+
"BUILD", "platform(name='plat')", "platform(name='dev_plat')", "platform(name='wsplat')");
375379
rewriteWorkspace("register_execution_platforms('//:wsplat')");
376380

377381
SkyKey executionPlatformsKey = RegisteredExecutionPlatformsValue.key(targetConfigKey);
@@ -387,6 +391,7 @@ public void testRegisteredExecutionPlatforms_bzlmod() throws Exception {
387391
assertExecutionPlatformLabels(result.get(executionPlatformsKey))
388392
.containsExactly(
389393
Label.parseCanonical("//:plat"),
394+
Label.parseCanonical("//:dev_plat"),
390395
Label.parseCanonical("@@bbb~1.0//:plat"),
391396
Label.parseCanonical("@@ccc~1.1//:plat"),
392397
Label.parseCanonical("@@eee~1.0//:plat"),

‎src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ public void testRegisteredToolchains_bzlmod() throws Exception {
307307
scratch.overwriteFile(
308308
"MODULE.bazel",
309309
"register_toolchains('//:tool')",
310+
"register_toolchains('//:dev_tool',dev_dependency=True)",
310311
"bazel_dep(name='bbb',version='1.0')",
311312
"bazel_dep(name='ccc',version='1.1')",
312313
"bazel_dep(name='toolchain_def',version='1.0')");
@@ -315,24 +316,28 @@ public void testRegisteredToolchains_bzlmod() throws Exception {
315316
createModuleKey("bbb", "1.0"),
316317
"module(name='bbb',version='1.0')",
317318
"register_toolchains('//:tool')",
319+
"register_toolchains('//:dev_tool',dev_dependency=True)",
318320
"bazel_dep(name='ddd',version='1.0')",
319321
"bazel_dep(name='toolchain_def',version='1.0')")
320322
.addModule(
321323
createModuleKey("ccc", "1.1"),
322324
"module(name='ccc',version='1.1')",
323325
"register_toolchains('//:tool')",
326+
"register_toolchains('//:dev_tool',dev_dependency=True)",
324327
"bazel_dep(name='ddd',version='1.1')",
325328
"bazel_dep(name='toolchain_def',version='1.0')")
326329
// [email protected] is not selected
327330
.addModule(
328331
createModuleKey("ddd", "1.0"),
329332
"module(name='ddd',version='1.0')",
330333
"register_toolchains('//:tool')",
334+
"register_toolchains('//:dev_tool',dev_dependency=True)",
331335
"bazel_dep(name='toolchain_def',version='1.0')")
332336
.addModule(
333337
createModuleKey("ddd", "1.1"),
334338
"module(name='ddd',version='1.1')",
335339
"register_toolchains('@eee//:tool', '//:tool')",
340+
"register_toolchains('@eee//:dev_tool',dev_dependency=True)",
336341
"bazel_dep(name='eee',version='1.0')",
337342
"bazel_dep(name='toolchain_def',version='1.0')")
338343
.addModule(
@@ -369,11 +374,13 @@ public void testRegisteredToolchains_bzlmod() throws Exception {
369374
scratch.file(
370375
moduleRoot.getRelative(repo).getRelative("BUILD").getPathString(),
371376
"load('@toolchain_def//:toolchain_def.bzl', 'declare_toolchain')",
372-
"declare_toolchain(name='tool')");
377+
"declare_toolchain(name='tool')",
378+
"declare_toolchain(name='dev_tool')");
373379
}
374380
scratch.overwriteFile(
375381
"BUILD",
376382
"load('@toolchain_def//:toolchain_def.bzl', 'declare_toolchain')",
383+
"declare_toolchain(name='dev_tool')",
377384
"declare_toolchain(name='tool')",
378385
"declare_toolchain(name='wstool')");
379386
rewriteWorkspace("register_toolchains('//:wstool')");
@@ -391,6 +398,7 @@ public void testRegisteredToolchains_bzlmod() throws Exception {
391398
assertToolchainLabels(result.get(toolchainsKey))
392399
.containsAtLeast(
393400
Label.parseCanonical("//:tool_impl"),
401+
Label.parseCanonical("//:dev_tool_impl"),
394402
Label.parseCanonical("@@bbb~1.0//:tool_impl"),
395403
Label.parseCanonical("@@ccc~1.1//:tool_impl"),
396404
Label.parseCanonical("@@eee~1.0//:tool_impl"),

0 commit comments

Comments
 (0)