Skip to content

Switch to main branch#211

Merged
kennyadsl merged 1 commit intosolidusio:masterfrom
mamhoff:switch-to-main-branch
Jul 25, 2023
Merged

Switch to main branch#211
kennyadsl merged 1 commit intosolidusio:masterfrom
mamhoff:switch-to-main-branch

Conversation

@mamhoff
Copy link
Copy Markdown
Contributor

@mamhoff mamhoff commented Jun 16, 2023

Summary

This changes all references to the master branch in the repository to main in anticipation of changing the default branch on the repo to main.

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.

This changes all references to the `master` branch in the repository to
`main` in anticipation of changing the default branch on the repo to
`main`.
@mergify mergify Bot added the needs changelog label Needs a label to determine the type of change. label Jun 16, 2023
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 16, 2023

It looks like this PR is missing a label to determine the type of change it introduces. The maintainer should add one of the following labels:

  • bug for bugfixes.
  • enhancement for new features and improvements.
  • documentation for documentation changes.
  • security for security patches.
  • removed for feature removals.
  • infrastructure for internal changes that should not go in the changelog.

Additionally, the maintainer may also want to add one of the following:

  • breaking for breaking changes.
  • deprecated for feature deprecations.

Once the correct labels have been set, simply remove the needs changelog label label from this PR so I can merge it.

@kennyadsl
Copy link
Copy Markdown
Member

kennyadsl commented Jun 22, 2023

Thanks @mamhoff. Does this mean that by merging this PR we will need to change the default branch of all extensions (to keep them aligned with the default template)? I'm a bit scared about the work needed for that.

On the other side, if you create an extension today using the template, it will create it with the wrong default branch name.

@solidusio/core-team @solidusio/nebulab any thoughts?

@mamhoff
Copy link
Copy Markdown
Contributor Author

mamhoff commented Jun 22, 2023

Most of this affects only new extensions as far as I can oversee: gemspec, README and so on. The only change I'm not so sure about what it does is the mergify one, but I don't imagine that the mergify.yml in this repo would affect any other repo?

@kennyadsl
Copy link
Copy Markdown
Member

When you execute the task again on an existing extension, it will keep asking to update those pieces over and over again. Not a big deal though, as you mentioned, it will only in places that you probably don't want to update anyway.

@kennyadsl
Copy link
Copy Markdown
Member

For mergify: I think you are right, it doesn't impact any other repo, but merging this PR we should change the default branch here to have it working.

@waiting-for-dev
Copy link
Copy Markdown
Contributor

I think that renaming master to main for all the supported extensions (the ones in solidusio) is very straightforward: doing the rename and creating very minor (and probably mostly cosmetic because of the automatic redirects). So I'd merge this PR once that's being done. What do you think?

@kennyadsl kennyadsl merged commit 66e0800 into solidusio:master Jul 25, 2023
@waiting-for-dev
Copy link
Copy Markdown
Contributor

I renamed the branch accordingly.

@waiting-for-dev
Copy link
Copy Markdown
Contributor

All not-archived extensions on the solidusio organization are now using main as the default branch name.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs changelog label Needs a label to determine the type of change.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants