Skip to content

Commit

Permalink
Trigger workflows on merges to main as well as master
Browse files Browse the repository at this point in the history
  • Loading branch information
mortenmj authored and EdSchouten committed Sep 27, 2024
1 parent 256ec6c commit 3591bd4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
"on": {
"push": {
"branches": [
"main",
"master"
]
}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-requests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"on": {
"pull_request": {
"branches": [
"main",
"master"
]
}
Expand Down
4 changes: 2 additions & 2 deletions tools/github_workflows/workflows_template.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
},
Expand Down

0 comments on commit 3591bd4

Please sign in to comment.