Skip to content

Correct branch name in rubocop workflow to master#181

Merged
nadjaheitmann merged 1 commit into
masterfrom
fix_github_action
Jun 12, 2026
Merged

Correct branch name in rubocop workflow to master#181
nadjaheitmann merged 1 commit into
masterfrom
fix_github_action

Conversation

@nadjaheitmann

Copy link
Copy Markdown
Contributor

OR: We rename the master branch to 'main' ;)

@nadjaheitmann nadjaheitmann changed the title change main branch in rubocop workflow to master Correct branch name in rubocop workflow to master Jun 11, 2026
@m-bucher

Copy link
Copy Markdown
Member

We rename the master branch to 'main' ;)

Honestly, I'd rather do the rename, it kinda has been on our plate for quite some time anyway 😇

@nadjaheitmann

Copy link
Copy Markdown
Contributor Author

We rename the master branch to 'main' ;)

Honestly, I'd rather do the rename, it kinda has been on our plate for quite some time anyway 😇

I don't mind. How do we do that without breaking everything?

@m-bucher

Copy link
Copy Markdown
Member

Push main as new Branch and change the default-branch setting to main, I guess. Existing PRs then probably have to be edited to merge into main instead. Or we could merge them before moving 😁

Probably also a good idea to check for other references to master in the code.

@nadjaheitmann

nadjaheitmann commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

Probably also a good idea to check for other references to master in the code.

It is only the js workflow. I guess, Katello folks are still on master :D

**16:33` $ git reset --hard github/master
HEAD is now at df91380 Bump theforeman/actions/.github/workflows/foreman_plugin_js.yml (#179)
✔ ~/projects/foreman_scc_manager [:df91380|…16⚑ 27]
16:34 $ grep -rni 'master' --exclude-dir={.git,locale,node_modules,public}
.github/workflows/js_tests.yml:5: - master
gemfile.d/katello.rb:1:gem 'katello', github: 'Katello/katello', branch: 'master'
**

also adding 'main' for future rename of default-branch
@m-bucher m-bucher force-pushed the fix_github_action branch from f091efd to 7124248 Compare June 12, 2026 08:56
@m-bucher

Copy link
Copy Markdown
Member

I have put 'main' and 'master' into the github workflows now.

Can be changed again after renaming.

@nadjaheitmann

Copy link
Copy Markdown
Contributor Author

I have put 'main' and 'master' into the github workflows now.

Can be changed again after renaming.

I like that!

@nadjaheitmann nadjaheitmann merged commit 0d40141 into master Jun 12, 2026
15 checks passed
@nadjaheitmann nadjaheitmann deleted the fix_github_action branch June 12, 2026 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants