Skip to content

Commit e4d193a

Browse files
authored
Fix uv-trampoline-builder builds from crates.io by moving bundled executables (#16922)
Closes #16836
1 parent fee7f9d commit e4d193a

11 files changed

Lines changed: 16 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ jobs:
478478
working-directory: ${{ env.UV_WORKSPACE }}/crates/uv-trampoline
479479
run: |
480480
cargo build --target ${{ matrix.target-arch }}-pc-windows-msvc
481-
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-console.exe trampolines/uv-trampoline-${{ matrix.target-arch }}-console.exe
482-
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-gui.exe trampolines/uv-trampoline-${{ matrix.target-arch }}-gui.exe
481+
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-${{ matrix.target-arch }}-console.exe
482+
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-${{ matrix.target-arch }}-gui.exe
483483
- name: "Test new binaries"
484484
working-directory: ${{ env.UV_WORKSPACE }}
485485
run: |

crates/uv-trampoline-builder/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ homepage = { workspace = true }
99
repository = { workspace = true }
1010
authors = { workspace = true }
1111
license = { workspace = true }
12+
include = ["src/**/*", "trampolines/*.exe", "Cargo.toml", "README.md"]
1213

1314
[features]
1415
default = ["production"]

crates/uv-trampoline-builder/src/lib.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,25 @@ use fs_err::File;
66
use thiserror::Error;
77

88
#[cfg(all(windows, target_arch = "x86"))]
9-
const LAUNCHER_I686_GUI: &[u8] =
10-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-i686-gui.exe");
9+
const LAUNCHER_I686_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-i686-gui.exe");
1110

1211
#[cfg(all(windows, target_arch = "x86"))]
1312
const LAUNCHER_I686_CONSOLE: &[u8] =
14-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-i686-console.exe");
13+
include_bytes!("../trampolines/uv-trampoline-i686-console.exe");
1514

1615
#[cfg(all(windows, target_arch = "x86_64"))]
17-
const LAUNCHER_X86_64_GUI: &[u8] =
18-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-x86_64-gui.exe");
16+
const LAUNCHER_X86_64_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-x86_64-gui.exe");
1917

2018
#[cfg(all(windows, target_arch = "x86_64"))]
2119
const LAUNCHER_X86_64_CONSOLE: &[u8] =
22-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-x86_64-console.exe");
20+
include_bytes!("../trampolines/uv-trampoline-x86_64-console.exe");
2321

2422
#[cfg(all(windows, target_arch = "aarch64"))]
25-
const LAUNCHER_AARCH64_GUI: &[u8] =
26-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-aarch64-gui.exe");
23+
const LAUNCHER_AARCH64_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-aarch64-gui.exe");
2724

2825
#[cfg(all(windows, target_arch = "aarch64"))]
2926
const LAUNCHER_AARCH64_CONSOLE: &[u8] =
30-
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-aarch64-console.exe");
27+
include_bytes!("../trampolines/uv-trampoline-aarch64-console.exe");
3128

3229
// https://learn.microsoft.com/en-us/windows/win32/menurc/resource-types
3330
#[cfg(windows)]

crates/uv-trampoline/trampolines/uv-trampoline-aarch64-console.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-aarch64-console.exe

File renamed without changes.

crates/uv-trampoline/trampolines/uv-trampoline-aarch64-gui.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-aarch64-gui.exe

File renamed without changes.

crates/uv-trampoline/trampolines/uv-trampoline-i686-console.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-i686-console.exe

File renamed without changes.

crates/uv-trampoline/trampolines/uv-trampoline-i686-gui.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-i686-gui.exe

File renamed without changes.

crates/uv-trampoline/trampolines/uv-trampoline-x86_64-console.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-x86_64-console.exe

File renamed without changes.

crates/uv-trampoline/trampolines/uv-trampoline-x86_64-gui.exe renamed to crates/uv-trampoline-builder/trampolines/uv-trampoline-x86_64-gui.exe

File renamed without changes.

crates/uv-trampoline/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ cargo +nightly-2025-06-23 xwin build --release --target aarch64-pc-windows-msvc
5656
After building the trampolines for all supported architectures:
5757

5858
```shell
59-
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-aarch64-console.exe
60-
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-aarch64-gui.exe
61-
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-x86_64-console.exe
62-
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-x86_64-gui.exe
63-
cp target/i686-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-i686-console.exe
64-
cp target/i686-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-i686-gui.exe
59+
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-aarch64-console.exe
60+
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-aarch64-gui.exe
61+
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-x86_64-console.exe
62+
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-x86_64-gui.exe
63+
cp target/i686-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-i686-console.exe
64+
cp target/i686-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-i686-gui.exe
6565
```
6666

6767
### Testing the trampolines

0 commit comments

Comments
 (0)