Skip to content

Commit

Permalink
Make the main branches tunable
Browse files Browse the repository at this point in the history
Some consumers of modulesync want to enable this for e.g. a `develop`
branch, so make it tunable and use the `main` and `master` names as
default value for this new setting which should work out-of the box for
most cases.
  • Loading branch information
smortex committed Jan 22, 2024
1 parent 2195a16 commit 28a40a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
pidfile_workaround: false
additional_packages: ''
acceptance_tests: true
main_branches: ['main', 'master']
# PDK creates this
.github/workflows/puppet-lint.yml:
delete: true
Expand Down
5 changes: 3 additions & 2 deletions moduleroot/.github/workflows/ci.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
pull_request: {}
push:
branches:
- main
- master
<%- @configs['main_branches'].each do |main_branch| -%>
- <%= main_branch %>
<%- end -%>

concurrency:
group: ${{ github.ref_name }}
Expand Down

0 comments on commit 28a40a6

Please sign in to comment.