Skip to content

fix(ci): backport main changes with Mergify #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LalatenduMohanty wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix(ci): backport main changes with Mergify #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0cba64
fix(ci): use PR instead of direct push for feature branch sync
LalatenduMohanty Sep 3, 2026
b9af6c1
fix(ci): backport main changes with Mergify
LalatenduMohanty Oct 13, 2026
8f9057b
docs: shorten resolver backport guidance
LalatenduMohanty Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 0 additions & 126 deletions .github/workflows/sync-feature-branch.yaml
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
pull_request_rules:
- name: Backport main changes to new-resolver-config
conditions:
- repository-full-name=python-wheel-build/fromager
- base=main
- merged
# PR #1367 brought the feature branch up to date at this cutoff.
- merged-at>2026-10-13T18:55:47Z
- head!=new-resolver-config
actions:
backport:
branches:
- new-resolver-config
ignore_conflicts: true
label_conflicts: conflicts

- name: Add CI label
conditions:
- or:
Expand Down Expand Up @@ -27,6 +42,10 @@ pull_request_rules:
conditions:
- and:
- "-draft"
# Maintainers merge resolver backports after reviewing CI and conflicts.
- or:
- base!=new-resolver-config
- -head~=^mergify/bp/new-resolver-config/

# Unit tests
- check-success=unit (3.12, 1.75, ubuntu-latest)
Expand Down
19 changes: 19 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Fromager thrives on practical, well-tested contributions. This guide summarizes
- [Quick Start](#quick-start)
- [Coding Standards](#coding-standards)
- [Testing](#testing)
- [Resolver Branch Backports](#resolver-branch-backports)
- [Commit Guidelines](#commit-guidelines)
- [Before Submitting](#before-submitting)
- [Design Patterns Used in Fromager](#design-patterns-used-in-fromager)
Expand Down Expand Up @@ -225,6 +226,24 @@ hatch run test:coverage-report # Coverage summary

---

## Resolver Branch Backports

Mergify cherry-picks PRs merged into `main` after the
[baseline sync #1367](https://github.com/python-wheel-build/fromager/pull/1367)
into backport PRs for `new-resolver-config`, using its GitHub App without a personal
token. Maintainers review and manually merge them after applicable CI passes,
merging dependent backports in source order.

Resolve conflicts and remove the `conflicts` label before merging. To request a
missing backport, check for an existing PR, then comment
`@mergifyio backport new-resolver-config` on the merged source PR.

Direct pushes and unsupported merge histories need manual backports. Cherry-picks
create new commits, so Git may still report the branch as behind `main`. Remove
the backport rule when the feature branch is retired.

---

## Commit Guidelines

Fromager follows [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
Expand Down
Loading