Skip to content

[CI] Remove unnecessary upmerges between branches#18389

Merged
GSadee merged 1 commit intoSylius:2.1from
GSadee:SYL-5525-ci-upmerge
Sep 24, 2025
Merged

[CI] Remove unnecessary upmerges between branches#18389
GSadee merged 1 commit intoSylius:2.1from
GSadee:SYL-5525-ci-upmerge

Conversation

@GSadee
Copy link
Copy Markdown
Member

@GSadee GSadee commented Sep 24, 2025

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

Summary by CodeRabbit

  • Chores
    • Streamlined maintenance automation by updating the upmerge workflow to focus on the current release line (merging 2.1 into 2.2). This reduces unnecessary background merge activity and keeps maintenance aligned with the latest version. No changes to product features, performance, or user workflows. No action required.

@GSadee GSadee requested review from a team as code owners September 24, 2025 19:32
@GSadee GSadee added the Maintenance CI configurations, READMEs, releases, etc. label Sep 24, 2025
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Sep 24, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

The upmerge workflow’s matrix was reduced to a single branch pair: base 2.1 to target 2.2. All other workflow logic, triggers, and PR creation steps remain unchanged.

Changes

Cohort / File(s) Summary
CI workflow update
.github/workflows/upmerge_pr.yaml
Narrowed matrix to only base 2.1 → target 2.2; no other step, trigger, or logic changes.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested labels

CI

Suggested reviewers

  • TheMilek

Poem

I hopped through branches, light and spry,
From 2.1 to 2.2 I fly—
A single path, a tidy queue,
No extra burrows to tunnel through.
Thump-thump! says CI, crisp and new. 🐇✨

✨ Finishing touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

📜 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 d1c9fde and a93e3fd.

📒 Files selected for processing (1)
  • .github/workflows/upmerge_pr.yaml (1 hunks)

Tip

👮 Agentic pre-merge checks are now available in preview!

Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.

  • Built-in checks – Quickly apply ready-made checks to enforce title conventions, require pull request descriptions that follow templates, validate linked issues for compliance, and more.
  • Custom agentic checks – Define your own rules using CodeRabbit’s advanced agentic capabilities to enforce organization-specific policies and workflows. For example, you can instruct CodeRabbit’s agent to verify that API documentation is updated whenever API schema files are modified in a PR. Note: Upto 5 custom checks are currently allowed during the preview period. Pricing for this feature will be announced in a few weeks.

Please see the documentation for more information.

Example:

reviews:
  pre_merge_checks:
    custom_checks:
      - name: "Undocumented Breaking Changes"
        mode: "warning"
        instructions: |
          Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).

Please share your feedback with us on this Discord post.


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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@GSadee GSadee merged commit 167bd51 into Sylius:2.1 Sep 24, 2025
8 of 9 checks passed
@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 24, 2025

❗ Preview Environment deployment failed on Bunnyshell

See: Environment Details | Pipeline Logs

Check https://github.com/Sylius/Sylius/actions/runs/17987519520 for details.

Available commands:

  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Maintenance CI configurations, READMEs, releases, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant