Automated rollback of commit 536a166270590a8dbc701718550383f3a07cc763.
*** Reason for rollback ***
Found an incremental correctness concern with build settings. Rolling back while investigating and to rollback for the bazel release
*** Original change description ***
Turn on --experimental_build_setting_api
RELNOTES: Turn on --experimental_build_setting_api by default for starlark build settings (see https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings for more info)
SKIP_CI=blaze is borked
PiperOrigin-RevId: 252715211
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 587e959..d5d4ac8 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -77,7 +77,7 @@
@Option(
name = "experimental_build_setting_api",
- defaultValue = "true",
+ defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
help =
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 987de0a..bde6ad9 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -238,7 +238,7 @@
public static final StarlarkSemantics DEFAULT_SEMANTICS =
builder()
// <== Add new options here in alphabetic order ==>
- .experimentalBuildSettingApi(true)
+ .experimentalBuildSettingApi(false)
.experimentalCcSkylarkApiEnabledPackages(ImmutableList.of())
.experimentalAllowIncrementalRepositoryUpdates(false)
.experimentalEnableAndroidMigrationApis(false)
diff --git a/src/test/shell/integration/starlark_configurations_test.sh b/src/test/shell/integration/starlark_configurations_test.sh
index 859d514..e0b2e59 100755
--- a/src/test/shell/integration/starlark_configurations_test.sh
+++ b/src/test/shell/integration/starlark_configurations_test.sh
@@ -161,6 +161,19 @@
expect_log "invalid package name '-//test_dont_parse_flags_after_dash_dash'"
}
+function test_doesnt_work_without_experimental_flag() {
+ local -r pkg=$FUNCNAME
+ mkdir -p $pkg
+
+ write_build_setting_bzl
+
+ bazel build //$pkg:my_drink --//$pkg:type=coffee > output 2>"$TEST_log" \
+ && fail "Expected failure"
+
+ expect_log "Error loading option //$pkg:type:"
+ expect_log "Extension file '$pkg/build_setting.bzl' has errors"
+}
+
function test_multiple_starlark_flags() {
local -r pkg=$FUNCNAME
mkdir -p $pkg
