diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8783b72..e1af10b 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 3289034..177cbba 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/CHANGELOG.md b/CHANGELOG.md index 4252824..1fbcc88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ - Bump Bundler 2.6.9 → 2.7.2 - Bump json 2.19.5 → 2.19.7 -## master +## Unreleased - Bump dependencies (rack 3.1.19 → 3.2.6, rake, rspec-\*, timecop, simplecov-html, diff-lcs) - Bump Ruby to 3.4.9 (zlib CVE-2026-27820) diff --git a/RELEASING.md b/RELEASING.md index 105b9e0..558e798 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,13 +1,12 @@ # Releasing -1. Create branch `X.Y.Z` from develop. +1. Create branch `X.Y.Z` from `main`. 2. Update `VERSION` in `lib/castle/version.rb` to the new version 3. Run `bundle` 4. Update the `CHANGELOG.md` for the impending release 5. `git commit -am "release X.Y.Z."` (where X.Y.Z is the new version) -6. Push to Github, make PR to the develop branch, and when approved, merge. -7. Pull latest `develop`, merge it to `master`, and push it. -8. Make a release on Github from the `master` branch, specify tag as `vX.Y.Z` to create a tag. -9. `git checkout master && git pull` -10. `gem build castle-rb.gemspec` -11. `gem push castle-rb-X.Y.Z.gem` +6. Push to Github, make PR to the `main` branch, and when approved, merge. +7. Make a release on Github from the `main` branch, specify tag as `vX.Y.Z` to create a tag. +8. `git checkout main && git pull` +9. `gem build castle-rb.gemspec` +10. `gem push castle-rb-X.Y.Z.gem`