retry uv installs by tshepang · Pull Request #2245 · ferrocene/ferrocene

tshepang · 2026-03-26T18:23:53Z

Also, remove some redundant uv install script calls

tshepang · 2026-03-26T18:24:17Z

bors try

bors-ferrocene · 2026-03-26T20:29:08Z

try

Build failed:

full

tshepang · 2026-03-27T06:49:23Z

bors retry

bors-ferrocene · 2026-03-27T08:56:36Z

try

Build succeeded:

full
setup

uv is already installed in the docker image... see ferrocene/ci/docker-images/ubuntu-20

jyn514

one suggestion, LGTM otherwise 👍

jyn514

nice work, thank you!

jyn514 · 2026-03-30T08:50:44Z

bors merge

bors-ferrocene · 2026-03-30T12:23:37Z

Build succeeded:

full
setup

Ferrocene-backport-of: #2245

2294: manual backports r=Hoverbear a=jyn514 #2237 and #2245 Co-authored-by: Jynn Nelson <[email protected]> Co-authored-by: Tshepang Mbambo <[email protected]>

2294: manual backports r=jyn514 a=jyn514 #2237 and #2245 2303: Backport to `release/1.95` r=jyn514 a=ferrocene-automations[bot] This PR backports the following PRs to the `release/1.95` branch: * #2282 Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them. Co-authored-by: Jynn Nelson <[email protected]> Co-authored-by: Tshepang Mbambo <[email protected]> Co-authored-by: Urhengulas <[email protected]>

2291: backport: squash and use `cherry-pick`, not rebase r=Urhengulas a=jyn514 This hits many fewer conflicts when backporting. Now, instead of requiring every commit to backport cleanly, we only require the diff between `main` and the PR to backport cleanly. This decreases the fraction of PRs that need to be submitted manually, and also reduces the manual work needed to backport PRs when a manual backport is needed. There are also various other changes to make the backporting scripts more maintainable and testable; see each individual commit for details. Unlike before, this does not mess with the current git state; running `git cherry-pick --abort` puts you back in exactly the same state you were in before you ran `one.py`. See #2301 for an example PR opened by this automation, and https://github.com/ferrocene/ferrocene/actions/runs/24351997960/job/71108663815 for a sample job output. --- ## Testing Here is a sample session using `one.py` to do a manual backport for the upcoming release: ```console $ git checkout origin/release/1.95 HEAD is now at a31dd5c Merge #2258 $ git checkout jyn/backport-automation ferrocene/tools/backport ferrocene/tools/automations-common $ ferrocene/tools/backport/one.py 2245 ERROR: this script cannot be run when you have staged changes; try running `git reset` $ git reset Unstaged changes after reset: M ferrocene/tools/automations-common/src/automations_common/automated_prs.py M ferrocene/tools/backport/all.py M ferrocene/tools/backport/one.py $ ferrocene/tools/backport/one.py 2245 17:45 warning: if no API token is set in the GITHUB_TOKEN env var, requests may be rate-limited INFO: backporting #2245 to a31dd5c (please do not CTRL-C) Auto-merging .circleci/workflows.yml Auto-merging ferrocene/ci/scripts/setup-uv.sh CONFLICT (content): Merge conflict in ferrocene/ci/scripts/setup-uv.sh error: could not apply d3faae633305... Backport #2245 ERROR: Encountered a merge conflict backporting #2245 INFO: attempting to auto-solve conflicts with mergiraf WARN Mergiraf: Could not find a supported language for ferrocene/ci/scripts/setup-uv.sh HELP: Fix the conflicts, run 'git add/rm <filepath>', then run 'git cherry-pick --continue'. NOTE: Running 'git cherry-pick --abort' will put you back in your original git state. NOTE: conflicts exist in the following locations: ferrocene/ci/scripts/setup-uv.sh:7-17 NOTE: 'HEAD' in the conflicted files refers to your current branch, a31dd5c $ git diff --name-status --cached M .circleci/workflows.yml U ferrocene/ci/scripts/setup-uv.sh $ git status | head -n5 HEAD detached at origin/release/1.95 You are currently cherry-picking commit d3faae633305. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) ``` (After this lands on beta, the `git checkout ferrocene/tools && git reset` lines will no longer be needed.) 2336: Fix several bugs in `ferrocene::prevalidated` r=Urhengulas a=jyn514 Thanks to `@Urhengulas` for catching these. 1. The THIR pass didn't check associated items at all. This is fixed in the first commit and tested in `tests/ui/ferrocene/lint-prevalidated/thir-impl-item.rs`. The second commit adds the missing items to libcore. 2. The post-mono pass didn't check dynamic casts. I had correctly "failed closed" here -- the THIR pass would ICE if it wasn't able to check a cast — but because of 1. there were several casts in libcore that weren't caught, including in libcore. The ICE is fixed in the third commit and the post-mono pass is extended in the fourth. This is tested in `tests/ui/ferrocene/lint-prevalidated/dyn-cast-post-mono.rs`. 3. The post-mono pass can't handle MIR inlining. I tried to get this working (see https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/SourceScopeData.20-.3E.20SourceScope/with/590200295), but wasn't able to figure out how to do it reliably. Instead I just disable mir inlining in the 5th commit. This is tested in `tests/ui/ferrocene/lint-prevalidated/mir-inlining.rs`. Co-authored-by: Jynn Nelson <[email protected]> Co-authored-by: Urhengulas <[email protected]>

bors-ferrocene Bot added a commit that referenced this pull request Mar 26, 2026

Try #2245:

e9e7ada

tshepang force-pushed the tshepang/retry-uv-installs branch from 964fc46 to d08aaeb Compare March 27, 2026 06:38

bors-ferrocene Bot added a commit that referenced this pull request Mar 27, 2026

Try #2245:

ee94484

tshepang added 2 commits March 27, 2026 15:41

retry uv installs

33acef7

remove redundant runs of uv installs

6598788

uv is already installed in the docker image... see ferrocene/ci/docker-images/ubuntu-20

tshepang force-pushed the tshepang/retry-uv-installs branch from d08aaeb to 6598788 Compare March 27, 2026 14:41

tshepang marked this pull request as ready for review March 27, 2026 14:43

jyn514 reviewed Mar 27, 2026

View reviewed changes

Comment thread ferrocene/ci/scripts/setup-uv.sh Outdated

code reuse

8609822

tshepang force-pushed the tshepang/retry-uv-installs branch from 6f27d16 to 8609822 Compare March 27, 2026 18:58

jyn514 approved these changes Mar 30, 2026

View reviewed changes

bors-ferrocene Bot merged commit 67638c5 into main Mar 30, 2026
4 checks passed

github-actions Bot added the backport:maybe PR candidate for backport label Mar 30, 2026

bors-ferrocene Bot deleted the tshepang/retry-uv-installs branch March 30, 2026 12:23

github-actions Bot added the merged-in:1.96 label Mar 30, 2026

jyn514 added the backport:1.95 label Apr 3, 2026

github-actions Bot removed the backport:maybe PR candidate for backport label Apr 3, 2026

jyn514 mentioned this pull request Apr 3, 2026

Automated pull from upstream beta #2243

Merged

ferrocene-automations Bot added the backport:manual PR requiring manual intervention to backport label Apr 6, 2026

jyn514 pushed a commit that referenced this pull request Apr 13, 2026

code reuse

6d8853a

Ferrocene-backport-of: #2245

jyn514 mentioned this pull request Apr 13, 2026

manual backports #2294

Merged

bors-ferrocene Bot added a commit that referenced this pull request Apr 13, 2026

Merge #2294

1f08bf9

2294: manual backports r=Hoverbear a=jyn514 #2237 and #2245 Co-authored-by: Jynn Nelson <[email protected]> Co-authored-by: Tshepang Mbambo <[email protected]>

github-actions Bot removed the backport:1.95 label Apr 14, 2026

jyn514 added merged-in:1.95 and removed backport:manual PR requiring manual intervention to backport labels Apr 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

retry uv installs#2245

retry uv installs#2245
bors-ferrocene[bot] merged 3 commits intomainfrom
tshepang/retry-uv-installs

tshepang commented Mar 26, 2026

Uh oh!

tshepang commented Mar 26, 2026

Uh oh!

bors-ferrocene Bot commented Mar 26, 2026

Uh oh!

tshepang commented Mar 27, 2026

Uh oh!

bors-ferrocene Bot commented Mar 27, 2026

Uh oh!

jyn514 left a comment •

edited

Loading

Uh oh!

Uh oh!

jyn514 left a comment

Uh oh!

jyn514 commented Mar 30, 2026

Uh oh!

Uh oh!

bors-ferrocene Bot commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

tshepang commented Mar 26, 2026

Uh oh!

tshepang commented Mar 26, 2026

Uh oh!

bors-ferrocene Bot commented Mar 26, 2026

try

Uh oh!

tshepang commented Mar 27, 2026

Uh oh!

bors-ferrocene Bot commented Mar 27, 2026

try

Uh oh!

jyn514 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jyn514 left a comment

Choose a reason for hiding this comment

Uh oh!

jyn514 commented Mar 30, 2026

Uh oh!

Uh oh!

bors-ferrocene Bot commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jyn514 left a comment •

edited

Loading