Also run CI an the main/master branch #864
Conversation
When merging a passing PR which was not on top of the last commit of the main branch, we may break CI. This make sure a CI run is triggered when the main branch is updated. As GitHub kindly display the status of the last commit on a project page, this allow to quickly see if a module CI works as intended or not. The main branch of most of our modules is `master` but a few use the more inclusive `main` name, so enable ci for both.
|
Can you test it on https://github.com/voxpupuli/puppet-example? |
| - main | ||
| - master |
There was a problem hiding this comment.
AFAIK we have the remote git branch in modulesync but I'm trying to find out how to use that in a template.
There was a problem hiding this comment.
I think it makes a migration in the future easier if we use both names here? Or is there a chance that a module has a different branch name other than main or master?
There was a problem hiding this comment.
Turns out we don't: https://github.com/voxpupuli/modulesync/blob/ea247449927d01c8c4fc11c6fd0dbc1e531fbc32/lib/modulesync.rb#L127-L133 does provide git_base but https://github.com/voxpupuli/modulesync#configuring-modulesync-defaults does tell the user there's an option for branch. That means you could run with develop as the default branch.
I can also see a case for making it configurable. In Foreman we also have *-stable that we like to run on. So IMHO supporting overriding it in config_defaults.yaml would be nice.
|
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.
|
👋 I am back from vacations 🏝️ I added a config entry as suggested by @ekohl, and checked it was working as expected by running modulesync on the puppet-example module that produce no diff. Ready for a new review, thanks! |
When merging a passing PR which was not on top of the last commit of the
main branch, we may break CI. This make sure a CI run is triggered when
the main branch is updated. As GitHub kindly display the status of the
last commit on a project page, this allow to quickly see if a module CI
works as intended or not.
The main branch of most of our modules is
masterbut a few use themore inclusive
mainname, so enable ci for both.