Merge pull request #864 from voxpupuli/also-run-ci-on-main-branch

Also run CI an the main/master branch
voxpupuli · Jan 22, 2024 · 3ce09a3 · 3ce09a3
2 parents be6e1d0 + 28a40a6
commit 3ce09a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/config_defaults.yml b/config_defaults.yml
@@ -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

diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
@@ -4,7 +4,13 @@
 
 name: CI
 
-on: pull_request
+on:
+ pull_request: {}
+ push:
+ branches:
+<%- @configs['main_branches'].each do |main_branch| -%>
+ - <%= main_branch %>
+<%- end -%>
 
 concurrency:
  group: ${{ github.ref_name }}