Skip to content

ci(backport): add support for backporting#4774

Merged
rami3l merged 1 commit intorust-lang:mainfrom
rami3l:ci/backport-branches
Mar 29, 2026
Merged

ci(backport): add support for backporting#4774
rami3l merged 1 commit intorust-lang:mainfrom
rami3l:ci/backport-branches

Conversation

@rami3l
Copy link
Copy Markdown
Member

@rami3l rami3l commented Mar 25, 2026

Partially addresses #4738.
It turns out that my previous CI refactoring was so good that this change can stay minimal.

cc @FranciscoTGouveia

mv book ${{ runner.temp }}/book/dev-guide
- name: Deploy to GitHub
if: ${{ !contains('["pull_request", "merge_group"]', github.event_name) }}
if: ${{ !contains('["pull_request", "merge_group"]', github.event_name) && !startsWith(github.ref_name, 'backport/') }}
Copy link
Copy Markdown
Member Author

@rami3l rami3l Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a lot of docs-deploying jobs already (plus the latest www branch rule for www-specific hotfix from @Kobzol), I don't think we should overwrite GitHub Pages in any more places 😅

@rami3l rami3l marked this pull request as ready for review March 28, 2026 22:53
@rami3l rami3l added this pull request to the merge queue Mar 29, 2026
Merged via the queue into rust-lang:main with commit 8fde0c6 Mar 29, 2026
29 checks passed
@djc
Copy link
Copy Markdown
Contributor

djc commented Mar 30, 2026

One suggestion: I think the backport/ prefix is a little weird for this. Backporting IMO is the action of copying changes from a branch targeting a future release to branches for previous releases. I think something like release/ or rel/ is more obvious.

@rami3l
Copy link
Copy Markdown
Member Author

rami3l commented Mar 30, 2026

One suggestion: I think the backport/ prefix is a little weird for this. Backporting IMO is the action of copying changes from a branch targeting a future release to branches for previous releases.

@djc That's exactly what I meant though... As I see it, we're always going to include either a port or a backport process, can we do it otherwise actually? How do you usually do it in other projects you maintain? 🤔

@rami3l
Copy link
Copy Markdown
Member Author

rami3l commented Mar 30, 2026

I imagine some kind of automation can be involved if we enforce semi-parsable PR/commit titles, if there's a BREAKING or ! indicator in the title we just don't include the change in the backporting PR 🙈

@djc
Copy link
Copy Markdown
Contributor

djc commented Mar 30, 2026

Sorry, I only meant the branch name prefix -- projects like Hickory and rustls use something like what I proposed.

Backporting probably doesn't make sense to automate until we're at substantially higher throughput.

@rami3l
Copy link
Copy Markdown
Member Author

rami3l commented Mar 30, 2026

@djc Okay, I'd take release/xxx in that case.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants