[CI] Update upmerge branches GH action to add 2.1 by GSadee · Pull Request #17669 · Sylius/Sylius

GSadee · 2025-02-11T14:12:10Z

Q	A
Branch?	2.1
Bug fix?	no
New feature?	no
BC breaks?	no
Deprecations?	no
Related tickets
License	MIT

Summary by CodeRabbit

Chores
- Revised the internal merging process to prioritize our latest release branches and streamline upcoming releases.

coderabbitai · 2025-02-11T14:12:17Z

Walkthrough

The pull request updates the GitHub Actions workflow for the "Upmerge PR" process. The change adjusts the matrix configuration by removing the combination of base_branch: "1.12" and target_branch: "1.13" and adding a new combination with base_branch: "2.0" and target_branch: "2.1". The workflow’s schedule, permissions, and steps such as code checkout, branch reset, and pull request creation remain unchanged.

Changes

File	Summary of Changes
`.github/workflows/upmerge_pr.yaml`	Updated matrix configuration: removed `(base_branch: "1.12", target_branch: "1.13")` and added `(base_branch: "2.0", target_branch: "2.1")`.

Sequence Diagram(s)

sequenceDiagram
    participant Scheduler as "Scheduler"
    participant Workflow as "Upmerge PR Workflow"
    participant Checkout as "Checkout Code"
    participant Reset as "Reset Upmerge Branch"
    participant PR as "Create Pull Request"

    Scheduler->>Workflow: Trigger scheduled run
    Workflow->>Checkout: Checkout code
    Workflow->>Reset: Reset branch using base_branch "2.0"
    Workflow->>PR: Create PR for target_branch "2.1"

Suggested labels

DX

Suggested reviewers

NoResponseMate

Poem

I'm a rabbit hopping through the code,
New branches in the matrix, a lighter load.
From old to new, the flow takes flight,
🐰 Dancing steps in the GitHub night.
With each merge, I giggle with glee—
The workflow sings a sweet decree!
Hop on, let’s code merrily!

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d4b9b15 and 9d9544e.

📒 Files selected for processing (1)

.github/workflows/upmerge_pr.yaml (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (2)

GitHub Check: Static checks / PHP 8.3, Symfony ^7.1
GitHub Check: Static checks / PHP 8.2, Symfony ^6.4

🔇 Additional comments (1)

.github/workflows/upmerge_pr.yaml (1)

29-31: LGTM! Branch hierarchy is correctly maintained.

The addition of the 2.0 -> 2.1 upmerge path is logically structured and maintains the proper branch hierarchy. This aligns with the PR objectives to add support for the 2.1 branch.

Let's verify the branch existence and relationships:
✅ Verification successful

🏁 Script executed:
#!/bin/bash
# Description: Verify that both branches exist and have the correct relationship

# Check if branches exist
git ls-remote --heads origin 2.0 2.1

# Verify the branch creation order (2.0 should be older than 2.1)
for branch in "2.0" "2.1"; do
  echo "Branch: $branch"
  git log -1 --format="%cr" "origin/$branch"
done
Length of output: 272

LGTM — Verified upmerge branch configuration.

Both the existence of the 2.0 and 2.1 branches, as well as their proper orchestration for the upmerge process, have been confirmed. The changes to add the 2.0 → 2.1 mapping in the workflow are correct and align with the PR objectives.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

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)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

github-actions · 2025-02-11T14:13:29Z

❌ Preview Environment deleted from Bunnyshell

Available commands:

🚀 /bns:deploy to redeploy the environment

[CI] Update upmerge branches GH action to add 2.1

9d9544e

GSadee added Maintenance CI configurations, READMEs, releases, etc. CI labels Feb 11, 2025

GSadee requested review from a team as code owners February 11, 2025 14:12

mpysiak approved these changes Feb 12, 2025

View reviewed changes

mpysiak merged commit 3b6e130 into Sylius:2.1 Feb 12, 2025
26 checks passed

GSadee deleted the update-upmerge-branches-action branch February 12, 2025 06:14

coderabbitai bot mentioned this pull request Jan 16, 2026

[CI] Update upmerge workflow to 2.2 -> 2.3 #18730

Merged

coderabbitai bot mentioned this pull request Feb 11, 2026

Update upmerge branches #18812

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CI] Update upmerge branches GH action to add 2.1#17669

[CI] Update upmerge branches GH action to add 2.1#17669
mpysiak merged 1 commit intoSylius:2.1from
GSadee:update-upmerge-branches-action

GSadee commented Feb 11, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Feb 11, 2025 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

github-actions bot commented Feb 11, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

GSadee commented Feb 11, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Suggested labels

Suggested reviewers

Poem

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

github-actions bot commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Preview Environment deleted from Bunnyshell

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

GSadee commented Feb 11, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Feb 11, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

github-actions bot commented Feb 11, 2025 •

edited

Loading