From 0d0d73fa38a3e102704df5f89e317793c00b4b77 Mon Sep 17 00:00:00 2001
From: Morten Mjelva <morten.mjelva@cognite.com>
Date: Fri, 27 Sep 2024 22:34:20 +0200
Subject: [PATCH] Trigger workflows on merges to main as well as master

---
 .github/workflows/master.yaml                       | 1 +
 .github/workflows/pull-requests.yaml                | 1 +
 tools/github_workflows/workflows_template.libsonnet | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 2fe49d48..458310a2 100644
--- 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
index 955c61ef..566f9a08 100644
--- 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
index e5c7c342..a96113a8 100644
--- 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),
     },
   },