Version 2.19.0-6.0.dev
Merge commit '145a9230de377dc1564ea563c55afbfa1912f102' into 'dev'
diff --git a/pkg/test_runner/lib/test_runner.dart b/pkg/test_runner/lib/test_runner.dart
index 617b454..1f35933 100644
--- a/pkg/test_runner/lib/test_runner.dart
+++ b/pkg/test_runner/lib/test_runner.dart
@@ -81,9 +81,9 @@
/// Finds the branch of a builder given the list of branches.
String branchOfBuilder(String builder, List<String> branches) {
- return branches.where((branch) => branch != "master").firstWhere(
+ return branches.where((branch) => branch != "main").firstWhere(
(branch) => builder.endsWith("-$branch"),
- orElse: () => "master");
+ orElse: () => "main");
}
/// Finds the named configuration to test according to the test matrix
@@ -320,7 +320,7 @@
parser.addOption("branch",
abbr: "B",
help: "Select the builders building this branch",
- defaultsTo: "master");
+ defaultsTo: "main");
parser.addOption("commit", abbr: "C", help: "Compare with this commit");
parser.addFlag("deflake",
help: "Re-run failing newly tests $deflakingCount times.");
diff --git a/tools/VERSION b/tools/VERSION
index e3fa560..37db314 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 19
PATCH 0
-PRERELEASE 5
+PRERELEASE 6
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 3241913..87cb254 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1,6 +1,6 @@
{
"branches": [
- "master"
+ "main"
],
"filesets": {
"analyzer_unit_tests": [
