diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3b4bfaf..a139c79 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,7 +2,7 @@ name: Lint on: push: - branches: [master, develop] + branches: [main] pull_request: jobs: diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index a2fb30b..ecba580 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -2,7 +2,7 @@ name: Specs on: push: - branches: [master, develop] + branches: [main] pull_request: jobs: diff --git a/RELEASING.md b/RELEASING.md index 960935a..8eaf64c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -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