Update make release for PR-only workflow#2
Conversation
main is now protected — all changes require PRs. Split the release flow into two steps: - make release: bumps version on a release branch, runs CI, commits, pushes, and creates a PR via gh - make tag VERSION=x.y.z: after PR is merged, checks out main, pulls, tags, and pushes the tag to trigger the GitHub Actions release build Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 21 minutes and 44 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
📝 WalkthroughWalkthroughThe Makefile's release workflow was changed: Changes
Sequence Diagram(s)mermaid Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Makefile`:
- Around line 131-132: The README still describes make release as "tag and push"
— update the README.md text that documents the release process so it reflects
the new two-step flow: change the description for the make release entry to
state it "bumps the version and creates a PR" and update the make tag entry to
state it "tags the merged release and pushes" (i.e., replace the old phrasing
around the "make release" and "make tag" entries so they match the Makefile help
output).
- Around line 118-120: The Makefile currently runs git push --tags which pushes
all local tags; change it to push only the newly created tag by replacing the
git push --tags line with a single-tag push (e.g., git push origin
"v$(VERSION)") so only v$(VERSION) is sent to the remote after `@git` tag
"v$(VERSION)"; ensure the tag push uses the same remote name used elsewhere
(origin) or a remote variable if one exists.
- Line 114: The Makefile's command target "tag" should be declared phony to
avoid collisions with any filesystem entry named "tag"; update the .PHONY
declaration so it includes "tag" (i.e., add "tag" to the existing .PHONY list)
so that the tag target (which runs git operations) always executes regardless of
a file named "tag" in the repository.
- Around line 102-103: The release branch is being created from the current HEAD
(BRANCH variable + git checkout -b "$$BRANCH") which can be a feature branch;
change the flow to first update main and create the release off the updated
main: fetch remote, checkout main, hard-reset or pull to match origin/main (so
local main is clean and up-to-date), then set BRANCH="release/v$$VERSION" and
run git checkout -b "$$BRANCH" to create the release branch from that updated
main.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
- Add tag to .PHONY declaration - Create release branch from updated main (checkout + pull --ff-only + clean working tree check) instead of current HEAD - Push only the new tag (git push origin v$VERSION) instead of all local tags (git push --tags) to avoid triggering stale releases - Update README make targets to match new two-step release flow Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
build.yml: runs lint + test + build on PRs and pushes to main (provides the status check required by branch protection). release.yml: runs on v* tag push only, builds both Chrome zip and Firefox xpi, creates GitHub Release with install notes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Makefile`:
- Around line 119-120: The tag target currently runs a plain git pull (after git
checkout main) which can create a merge commit; update the tag target to use a
fast-forward-only pull by changing the git pull invocation to include --ff-only
so it mirrors the release target and prevents accidental local merge commits
from being tagged.
- Around line 102-106: The release recipe in the Makefile must fail fast: add
"set -eu" at the start of the shell command list for the release target so any
failing git operation (e.g., the git checkout, git pull, or git checkout -b
steps referenced by BRANCH, git checkout, git pull, git status, git checkout -b)
will abort the recipe immediately; update the recipe to run "set -eu" before
executing the existing BRANCH=... and git commands.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 3a994803-2804-4023-ba0f-f059cac6ddc6
📒 Files selected for processing (2)
MakefileREADME.md
✅ Files skipped from review due to trivial changes (1)
- README.md
| BRANCH="release/v$$VERSION"; \ | ||
| git checkout main; \ | ||
| git pull --ff-only origin main; \ | ||
| if [ -n "$$(git status --porcelain)" ]; then echo "Working tree not clean"; exit 1; fi; \ | ||
| git checkout -b "$$BRANCH"; \ |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
find . -name "Makefile" -type f | head -5Repository: internetblacksmith/github-pr-dashboard
Length of output: 92
🏁 Script executed:
cat -n ./Makefile | head -120Repository: internetblacksmith/github-pr-dashboard
Length of output: 5783
Add fail-fast to the release recipe to prevent continuing after git errors.
The recipe runs as a single shell command list with backslash continuations. Without set -e, failures on lines 103 (git checkout), 104 (git pull), or 106 (git checkout -b) will not exit the script, allowing subsequent operations like package.json modifications to proceed on the wrong branch or state. Add set -eu at the recipe start.
Suggested fix
release:
- `@CURRENT`=$$(node -p "require('./package.json').version"); \
+ `@set` -eu; \
+ CURRENT=$$(node -p "require('./package.json').version"); \
MAJOR=$$(echo $$CURRENT | cut -d. -f1); \
MINOR=$$(echo $$CURRENT | cut -d. -f2); \
PATCH=$$(echo $$CURRENT | cut -d. -f3); \🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Makefile` around lines 102 - 106, The release recipe in the Makefile must
fail fast: add "set -eu" at the start of the shell command list for the release
target so any failing git operation (e.g., the git checkout, git pull, or git
checkout -b steps referenced by BRANCH, git checkout, git pull, git status, git
checkout -b) will abort the recipe immediately; update the recipe to run "set
-eu" before executing the existing BRANCH=... and git commands.
| @git checkout main | ||
| @git pull |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
# First, let's locate and read the Makefile around lines 119-120
fd -name "Makefile" -type f | head -5Repository: internetblacksmith/github-pr-dashboard
Length of output: 312
🏁 Script executed:
# Read the Makefile to see full context around lines 119-120
wc -l MakefileRepository: internetblacksmith/github-pr-dashboard
Length of output: 94
🏁 Script executed:
# Get context around lines 119-120
sed -n '100,135p' MakefileRepository: internetblacksmith/github-pr-dashboard
Length of output: 1873
Use --ff-only pull in tag to avoid tagging unintended local merges.
Line 120 uses plain git pull, which can create a merge commit if the local main branch diverges from upstream. That merge commit would then be tagged and pushed, bypassing the intended "merged-main-only" release path. The release target already uses --ff-only for this same operation; the tag target should match.
Suggested fix
`@git` checkout main
- `@git` pull
+ `@git` pull --ff-only origin main📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| @git checkout main | |
| @git pull | |
| `@git` checkout main | |
| `@git` pull --ff-only origin main |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Makefile` around lines 119 - 120, The tag target currently runs a plain git
pull (after git checkout main) which can create a merge commit; update the tag
target to use a fast-forward-only pull by changing the git pull invocation to
include --ff-only so it mirrors the release target and prevents accidental local
merge commits from being tagged.
1 participant
Summary
make releaseinto two steps for branch-protected mainmake release: bumps version, creates release branch + PRmake tag VERSION=x.y.z: tags the merged commit and pushes to trigger CITest plan
make help— verify release and tag targets listedmakemenu — verify options 6, 7, 8 show correctly🤖 Generated with Claude Code
Summary by CodeRabbit
Chores
Documentation