Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Also run CI an the main/master branch #864

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Also run CI an the main/master branch #864

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2195a16
Also run CI an the main/master branch
smortex Jan 9, 2024
28a40a6
Make the main branches tunable
smortex Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion moduleroot/.github/workflows/ci.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

name: CI

on: pull_request
on:
pull_request: {}
push:
branches:
- main
- master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK we have the remote git branch in modulesync but I'm trying to find out how to use that in a template.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


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