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.

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

Move branch workflow from develop and master to default and release #417

Merged
merged 1 commit into from
May 12, 2023

Conversation

pwtyler
Copy link
Member

@pwtyler pwtyler commented May 11, 2023

Before creating this PR, I branched default from develop and release from master.

After merging this PR, I will change the repo's default branch from master to default, and adjust branch protection rules for default and release.

I intend these to be the branch names we use for our common WordPress plugin release workflow as we build out the automation steps.

@pwtyler pwtyler requested review from a team as code owners May 11, 2023 22:06
@@ -16,12 +16,4 @@ updates:
- dependency-name: phpunit/phpunit
versions:
- ">= 9.a"
- "< 10"
- package-ecosystem: npm
Copy link
Member Author

Choose a reason for hiding this comment

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

Confirming: no reason for NPM on this project, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not that I'm aware of. It might be possible to dig through the history to see what it was used for, but I don't think it's used for anything currently.

@@ -6,7 +6,7 @@ updates:
interval: weekly
timezone: America/Los_Angeles
day: tuesday
target-branch: "develop"
target-branch: "default"
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sold that "default" is better than develop as a branch name. Agree about master -> release. But I suppose it might make the GitHub "default" branch appear more "stable" if it's called default.

Copy link
Member Author

Choose a reason for hiding this comment

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

That's my thought, I want it abundantly clear that this is the branch to merge in and out of, for all the people not reading CONTRIBUTING.md 😁

Copy link
Member Author

Choose a reason for hiding this comment

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

We should also add a PR template 😁

@@ -16,12 +16,4 @@ updates:
- dependency-name: phpunit/phpunit
versions:
- ">= 9.a"
- "< 10"
- package-ecosystem: npm
Copy link
Contributor

Choose a reason for hiding this comment

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

Not that I'm aware of. It might be possible to dig through the history to see what it was used for, but I don't think it's used for anything currently.

@pwtyler pwtyler merged commit 210ee5a into default May 12, 2023
@pwtyler pwtyler deleted the update-default-branch branch May 12, 2023 17:14
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