Skip to content

Use main as the default branch #56

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

Merged
bartes merged 1 commit into from
Sep 7, 2026
Merged

Use main as the default branch #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lint

on:
push:
branches: [master, develop]
branches: [main]
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Specs

on:
push:
branches: [master, develop]
branches: [main]
pull_request:

jobs:
Expand Down
7 changes: 3 additions & 4 deletions RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Releasing

1. Create branch `release/X.Y.Z` from `develop`.
1. Create branch `release/X.Y.Z` from `main`.
2. Update the `VERSION` constant in `lib/Castle/Castle.php` to the new version.
3. Update the `CHANGELOG.md` for the impending release.
4. `git commit -am "release X.Y.Z"` (where X.Y.Z is the new version).
5. Push to Github, make a PR to the `develop` branch, and when approved, merge.
6. Pull latest `develop`, merge it into `master`, and push `master` to `origin`.
7. Make a release on Github from the `master` branch, specify tag as `vX.Y.Z` to create a tag.
5. Push to Github, make a PR to the `main` branch, and when approved, merge.
6. Make a release on Github from the `main` branch, specify tag as `vX.Y.Z` to create a tag.

[Packagist](https://packagist.org/packages/castle/castle-php) is configured to
auto-update from the repository, so pushing the `vX.Y.Z` tag publishes the new
Expand Down
Loading