Skip to content

Commit 9deaec7

Browse files
committed
Move deprecating flags to bzlmod only
1 parent 7e53d2d commit 9deaec7

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.bazelci/presubmit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
# bazelci pipeline
3737
matrix:
3838
integration_shard_flags:
39-
- ["--test_tag_filters=shard_0", "--config=rbe"]
40-
- ["--test_tag_filters=shard_1", "--config=rbe"]
41-
- ["--test_tag_filters=shard_2", "--config=rbe"]
39+
- ["--test_tag_filters=shard_0"]
40+
- ["--test_tag_filters=shard_1"]
41+
- ["--test_tag_filters=shard_2"]
4242
test_flags:
4343
- ["--enable_bzlmod=true"]
4444
validate_config: 1

examples/android/.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ common --lockfile_mode=off
22
test --test_output=all
33
build --config=android_worker
44

5-
common --incompatible_disable_native_repo_rules=true
6-
common --incompatible_autoload_externally=
7-
85
# Worker configuration
96
build:android_worker \
107
--worker_max_instances=auto \

src/main/kotlin/io/bazel/kotlin/test/BazelIntegrationTestRunner.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,11 @@ object BazelIntegrationTestRunner {
168168
}
169169

170170
override fun workspaceFlag(isBzlMod: Boolean): Array<String> = if (isBzlMod) {
171-
arrayOf("--enable_bzlmod=true")
171+
arrayOf(
172+
"--enable_bzlmod=true",
173+
"--incompatible_disable_native_repo_rules=true",
174+
"--incompatible_autoload_externally=",
175+
)
172176
} else if (major >= 7) {
173177
arrayOf("--enable_workspace=true", "--enable_bzlmod=false")
174178
} else {

0 commit comments

Comments
 (0)