commit 9176a65efff734d298a1cc69bac8aeee16b7a2f7
author Ravi Mistry <rmistry@google.com> Mon May 17 10:59:51 2021 -0400
committer Ravi Mistry <rmistry@google.com> Wed May 19 20:06:05 2021 +0000
tree 1aa3715f8ee3f508e9ee76f06d887471563d6907
parent 10e7e77909c5be806180b789421d1d2c6d03a96a

[infra] Use TRIGGER_MAIN_ONLY instead of TRIGGER_MASTER_ONLY

Bug: skia:11987
Change-Id: I9d0aa44a90881f86416b3595e0756c1c1cdc60df
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409256
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

infra/bots/gen_tasks_logic/job_builder.go

diff --git a/infra/bots/gen_tasks_logic/job_builder.go b/infra/bots/gen_tasks_logic/job_builder.go
index 1ad0b87..02113ec 100644
--- a/infra/bots/gen_tasks_logic/job_builder.go
+++ b/infra/bots/gen_tasks_logic/job_builder.go
@@ -231,7 +231,7 @@
 	} else if b.frequency("Weekly") {
 		b.trigger(specs.TRIGGER_WEEKLY)
 	} else if b.extraConfig("Flutter", "CommandBuffer") {
-		b.trigger(specs.TRIGGER_MASTER_ONLY)
+		b.trigger(specs.TRIGGER_MAIN_ONLY)
 	} else if b.frequency("OnDemand") || b.role("Canary") {
 		b.trigger(specs.TRIGGER_ON_DEMAND)
 	} else {

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 57eca4a..33fa28a 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -374,7 +374,7 @@
       "tasks": [
         "Build-Debian9-Clang-arm-Release-Flutter_Android_Docker"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Build-Mac-Clang-arm64-Debug": {
       "tasks": [
@@ -445,7 +445,7 @@
       "tasks": [
         "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Build-Mac-Clang-x86_64-Debug-Metal": {
       "tasks": [
@@ -466,7 +466,7 @@
       "tasks": [
         "Build-Mac-Clang-x86_64-Release-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Build-Mac-Clang-x86_64-Release-Metal": {
       "tasks": [
@@ -727,7 +727,7 @@
       "tasks": [
         "Upload-BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Canary-Android": {
       "tasks": [
@@ -1267,7 +1267,7 @@
       "tasks": [
         "Upload-Perf-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Perf-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All": {
       "tasks": [
@@ -1283,7 +1283,7 @@
       "tasks": [
         "Upload-Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
       "tasks": [
@@ -1294,7 +1294,7 @@
       "tasks": [
         "Upload-Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
       "tasks": [
@@ -1305,7 +1305,7 @@
       "tasks": [
         "Upload-Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
       "tasks": [
@@ -2302,7 +2302,7 @@
       "tasks": [
         "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
       "tasks": [
@@ -2338,7 +2338,7 @@
       "tasks": [
         "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-OpenCL": {
       "tasks": [
@@ -2364,7 +2364,7 @@
       "tasks": [
         "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
       "tasks": [
@@ -2395,7 +2395,7 @@
       "tasks": [
         "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer"
       ],
-      "trigger": "master"
+      "trigger": "main"
     },
     "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal": {
       "tasks": [