Skip to content

Rename Solidus default branch to main#5042

Merged
waiting-for-dev merged 2 commits intomainfrom
waiting-for-dev/rename_default_branch
May 9, 2023
Merged

Rename Solidus default branch to main#5042
waiting-for-dev merged 2 commits intomainfrom
waiting-for-dev/rename_default_branch

Conversation

@waiting-for-dev
Copy link
Copy Markdown
Contributor

@waiting-for-dev waiting-for-dev commented Apr 24, 2023

Summary

  • Rename the expected default branch in GH workflows & development tools

  • Rename references to Solidus default branch from master to main

Ref #5038

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

The following are not always needed:

  • 📖 I have updated the README to account for my changes.
  • 📑 I have documented new code with YARD.
  • 🛣️ I have opened a PR to update the guides.
  • ✅ I have added automated tests to cover my changes.
  • 📸 I have attached screenshots to demo visual changes.

@waiting-for-dev waiting-for-dev requested a review from a team as a code owner April 24, 2023 13:15
@waiting-for-dev waiting-for-dev added type:enhancement Proposed or newly added feature release:major Breaking change on hold until next major release labels Apr 24, 2023
@github-actions github-actions Bot added changelog:repository Changes to the repository not within any gem changelog:solidus_core Changes to the solidus_core gem changelog:solidus Changes to the solidus meta-gem labels Apr 24, 2023
@waiting-for-dev waiting-for-dev added the changelog:skip Changes that we don't want to be listed in the Changelog label Apr 24, 2023
waiting-for-dev added a commit to solidusio/circleci-orbs-extensions that referenced this pull request Apr 24, 2023
@waiting-for-dev
Update orb to use new main Solidus default branch
9f1183b 
Ref solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
@waiting-for-dev waiting-for-dev self-assigned this Apr 24, 2023
waiting-for-dev added a commit to solidusio/solidus_stripe that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adopt new Solidus default branch
6b5f16a 
Ref. solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
waiting-for-dev added a commit to solidusio/solidus_starter_frontend that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
89472c5 
Ref. solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
waiting-for-dev added a commit to solidusio/solidus_paypal_commerce_platform that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adopt new Solidus default branch
b730d35 
Ref. solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
waiting-for-dev added a commit to solidusio/solidus_braintree that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adapt to new Solidus default branch
cab83e1 
Ref. solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
waiting-for-dev added a commit to solidusio/solidus_dev_support that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adapt new Solidus default branch
572fb4b 
Ref. solidusio/solidus#5042
@waiting-for-dev waiting-for-dev mentioned this pull request Apr 24, 2023
Merged
3 tasks
waiting-for-dev added a commit to solidusio/solidus_support that referenced this pull request Apr 24, 2023
@waiting-for-dev
Adapt to new Solidus default branch
8303615 
Ref. solidusio/solidus#5042
This was referenced Apr 24, 2023
Merged
Closed
kennyadsl
kennyadsl reviewed Apr 26, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

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

Left a quick comment, not approving yet only because I want to take a deeper look. Thanks Marc!

Comment thread .github/workflows/prepare_post_release.yml
${{ steps.pipeline_context.outputs.candidate_tag }}
- name: "Create patch branch"
if: github.ref_name == 'master'
if: github.ref_name == 'main'
Copy link
Copy Markdown
Member

@kennyadsl kennyadsl Apr 26, 2023

Choose a reason for hiding this comment

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

Do we need to backport any of these workflow changes to old versions branches? I'm assuming each branch will use the file they contain to spin up GitHub workflows but I'm not sure.

Copy link
Copy Markdown
Contributor Author

@waiting-for-dev waiting-for-dev Apr 26, 2023

Choose a reason for hiding this comment

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

Good point. It won't make a difference, as those branches are not called either master or main, but we can backport the changes for consistency.

waiting-for-dev added a commit to solidusio/solidus_dev_support that referenced this pull request May 9, 2023
@waiting-for-dev
Adapt new Solidus default branch
22c60b1 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_braintree that referenced this pull request May 9, 2023
@waiting-for-dev
Adapt to new Solidus default branch
439709d 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_paypal_commerce_platform that referenced this pull request May 9, 2023
@waiting-for-dev
Adopt new Solidus default branch
05cefe4 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_stripe that referenced this pull request May 9, 2023
@waiting-for-dev
Adopt new Solidus default branch
12fe5f4 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_stripe that referenced this pull request May 9, 2023
@waiting-for-dev
Adopt new Solidus default branch
278751e 
Ref. solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_user_roles that referenced this pull request May 10, 2023
@cpfergus1
Solidus 4.0 Master Branch Changed to Main
f8f0949 
solidusio/solidus#5042
cpfergus1 added a commit to solidusio-contrib/solidus_user_roles that referenced this pull request May 10, 2023
@cpfergus1
Solidus 4.0 Master Branch Changed to Main
3c32e9c 
solidusio/solidus#5042
cpfergus1 added a commit to solidusio-contrib/solidus_user_roles that referenced this pull request May 11, 2023
@cpfergus1
Solidus 4.0 Master Branch Changed to Main
b70eb4f 
solidusio/solidus#5042
cpfergus1 added a commit to solidusio-contrib/solidus_user_roles that referenced this pull request May 11, 2023
@cpfergus1
Solidus 4.0 Master Branch Changed to Main
d6fd5f3 
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
5289188 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
38d844b 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
05313b8 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
125aded 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
f3ef48b 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_jwt that referenced this pull request May 12, 2023
@cpfergus1
Use Main In Place of Master
be5a336 
Master has been deprecated in favor of main
solidusio/solidus#5042
cpfergus1 added a commit to cpfergus1/solidus_zip_zones that referenced this pull request May 12, 2023
@cpfergus1
Use Main Instead of Master
2e0e49c 
solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_i18n that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
52837a1 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_braintree that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch
df5ea7b 
Ref. solidusio/solidus#5042

[skip ci]
waiting-for-dev added a commit to solidusio/solidus_braintree that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch
3ca51ba 
Ref. solidusio/solidus#5042

[skip ci]
waiting-for-dev added a commit to solidusio/solidus_webhooks that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
07b0bc0 
Ref. solidusio/solidus#5042

[skip ci]
waiting-for-dev added a commit to solidusio/solidus_bolt that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
5581a94 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_subscriptions that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
23dea52 
Ref. solidusio/solidus#5042

[wip]
waiting-for-dev added a commit to solidusio/solidus_support that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch
b90a4af 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_support that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch
1f881e2 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_dev_support that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt new Solidus default branch
e9b8f72 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_dev_support that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt new Solidus default branch
ba8a2f3 
Ref. solidusio/solidus#5042

[skip ci]
waiting-for-dev added a commit to solidusio/solidus_affirm that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
0251fc9 
Ref. solidusio/solidus#5042

[skip ci]
waiting-for-dev added a commit to solidusio/solidus_bolt that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
3fc739f 
Ref. solidusio/solidus#5042
waiting-for-dev added a commit to solidusio/solidus_bolt that referenced this pull request May 22, 2023
@waiting-for-dev
Adapt to new Solidus default branch name
5eae1cf 
Ref. solidusio/solidus#5042

[skip ci]
@MassimilianoLattanzio MassimilianoLattanzio mentioned this pull request Apr 24, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennyadsl kennyadsl kennyadsl approved these changes

@adammathys adammathys adammathys approved these changes

@elia elia Awaiting requested review from elia

@rainerdema rainerdema Awaiting requested review from rainerdema

Assignees

@waiting-for-dev waiting-for-dev

Labels

backport-v3.3 Backport this pull-request to v3.3 backport-v3.4 Backport this pull-request to v3.4 backport-v4.0 Backport this pull-request to v4.0 changelog:repository Changes to the repository not within any gem changelog:skip Changes that we don't want to be listed in the Changelog changelog:solidus_core Changes to the solidus_core gem changelog:solidus Changes to the solidus meta-gem type:enhancement Proposed or newly added feature

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@waiting-for-dev @kennyadsl @adammathys