commit 145a9230de377dc1564ea563c55afbfa1912f102
author William Hesse <whesse@google.com> Mon Jul 18 12:48:33 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Mon Jul 18 12:48:33 2022 +0000
tree 7849aeaa87c775ecce6eade729e8d3a041a87cd1
parent ea7f3d4d967be60ff78d3abbc12bcd67c7a28af9

[test] Change default branch for test runner to main

Change-Id: Id5f6676c916810b6d4748dda1aff3ee4438a112b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/251764
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Michael Thomsen <mit@google.com>

pkg/test_runner/lib/test_runner.dart

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.");

tools/bots/test_matrix.json

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": [