ci: rebase main after release #129
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
WalkthroughA new step was added to the release workflow to automatically merge the Changes
Sequence Diagram(s)sequenceDiagram
participant Workflow
participant GitHub Actions
participant Git
Workflow->>GitHub Actions: Start release job
GitHub Actions->>Git: Create new version
alt dryRun == 'false'
GitHub Actions->>Git: Configure user
GitHub Actions->>Git: Fetch branches
GitHub Actions->>Git: Checkout main
GitHub Actions->>Git: Pull latest main
GitHub Actions->>Git: Merge release into main (no-ff)
GitHub Actions->>Git: Push main to remote
end
GitHub Actions->>Workflow: Complete release job
Poem
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. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
.github/workflows/release.yml (1)
58-58: Remove trailing whitespace – YAML-lint is currently failing
Both lines contain nothing but spaces. Trim them to keep the workflow YAML-lint-clean.- +Also applies to: 68-68
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
.github/workflows/release.yml(1 hunks)
🧰 Additional context used
🪛 YAMLlint (1.37.1)
.github/workflows/release.yml
[error] 58-58: trailing spaces
(trailing-spaces)
[error] 68-68: trailing spaces
(trailing-spaces)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Release new version 🛠 (20)
🔇 Additional comments (1)
.github/workflows/release.yml (1)
63-74: Merge the localreleasebranch instead oforigin/releaseto ensure the freshly-generated version bump is included
nx releasecommits on the checked-outreleasebranch. If – for whatever reason – that command does not push before this step runs,origin/releasemay lag behind the local branch, and the tag/bump commit will never reachmain. Merging the local branch avoids that race.- git merge origin/release --no-ff -m "chore: merge release into main" + git merge release --no-ff -m "chore: merge release into main"Optionally add an explicit
git push origin releaseright after thenx releasecall to guarantee remote parity.
PR Checklist
Please check if your PR fulfills the following requirements:
PR Type
What kind of change does this PR introduce?
Issue Number
Issue Number: N/A
Does this PR introduce a breaking change?
Other information
Summary by CodeRabbit