Trigger workflows on merges to main as well as master

buildbarn · Sep 27, 2024 · 0d0d73f · 0d0d73f
1 parent 256ec6c
commit 0d0d73f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -397,6 +397,7 @@
    "on": {
       "push": {
          "branches": [
+            "main",
             "master"
          ]
       }

diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
@@ -90,6 +90,7 @@
    "on": {
       "pull_request": {
          "branches": [
+            "main",
             "master"
          ]
       }

diff --git a/tools/github_workflows/workflows_template.libsonnet b/tools/github_workflows/workflows_template.libsonnet
@@ -184,12 +184,12 @@
   getWorkflows(binaries, containers): {
     'master.yaml': {
       name: 'master',
-      on: { push: { branches: ['master'] } },
+      on: { push: { branches: ['main', 'master'] } },
       jobs: getJobs(binaries, containers, true),
     },
     'pull-requests.yaml': {
       name: 'pull-requests',
-      on: { pull_request: { branches: ['master'] } },
+      on: { pull_request: { branches: ['main', 'master'] } },
       jobs: getJobs(binaries, containers, false),
     },
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -397,6 +397,7 @@ @@
        "on": {
           "push": {
              "branches": [
+                "main",
                 "master"
              ]
           }
@@ Expand Down @@