Fix uv-trampoline-builder builds from crates.io by moving bundled executables (#16922)
Closes https://github.com/astral-sh/uv/issues/16836
This commit is contained in:
Zanie Blue
@@ -478,8 +478,8 @@ jobs:
|
||||
working-directory: ${{ env.UV_WORKSPACE }}/crates/uv-trampoline
|
||||
run: |
|
||||
cargo build --target ${{ matrix.target-arch }}-pc-windows-msvc
|
||||
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-console.exe trampolines/uv-trampoline-${{ matrix.target-arch }}-console.exe
|
||||
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-gui.exe trampolines/uv-trampoline-${{ matrix.target-arch }}-gui.exe
|
||||
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-${{ matrix.target-arch }}-console.exe
|
||||
cp target/${{ matrix.target-arch }}-pc-windows-msvc/debug/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-${{ matrix.target-arch }}-gui.exe
|
||||
- name: "Test new binaries"
|
||||
working-directory: ${{ env.UV_WORKSPACE }}
|
||||
run: |
|
||||
|
||||
@@ -9,6 +9,7 @@ homepage = { workspace = true }
|
||||
repository = { workspace = true }
|
||||
authors = { workspace = true }
|
||||
license = { workspace = true }
|
||||
include = ["src/**/*", "trampolines/*.exe", "Cargo.toml", "README.md"]
|
||||
|
||||
[features]
|
||||
default = ["production"]
|
||||
|
||||
@@ -6,28 +6,25 @@ use fs_err::File;
|
||||
use thiserror::Error;
|
||||
|
||||
#[cfg(all(windows, target_arch = "x86"))]
|
||||
const LAUNCHER_I686_GUI: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-i686-gui.exe");
|
||||
const LAUNCHER_I686_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-i686-gui.exe");
|
||||
|
||||
#[cfg(all(windows, target_arch = "x86"))]
|
||||
const LAUNCHER_I686_CONSOLE: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-i686-console.exe");
|
||||
include_bytes!("../trampolines/uv-trampoline-i686-console.exe");
|
||||
|
||||
#[cfg(all(windows, target_arch = "x86_64"))]
|
||||
const LAUNCHER_X86_64_GUI: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-x86_64-gui.exe");
|
||||
const LAUNCHER_X86_64_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-x86_64-gui.exe");
|
||||
|
||||
#[cfg(all(windows, target_arch = "x86_64"))]
|
||||
const LAUNCHER_X86_64_CONSOLE: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-x86_64-console.exe");
|
||||
include_bytes!("../trampolines/uv-trampoline-x86_64-console.exe");
|
||||
|
||||
#[cfg(all(windows, target_arch = "aarch64"))]
|
||||
const LAUNCHER_AARCH64_GUI: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-aarch64-gui.exe");
|
||||
const LAUNCHER_AARCH64_GUI: &[u8] = include_bytes!("../trampolines/uv-trampoline-aarch64-gui.exe");
|
||||
|
||||
#[cfg(all(windows, target_arch = "aarch64"))]
|
||||
const LAUNCHER_AARCH64_CONSOLE: &[u8] =
|
||||
include_bytes!("../../uv-trampoline/trampolines/uv-trampoline-aarch64-console.exe");
|
||||
include_bytes!("../trampolines/uv-trampoline-aarch64-console.exe");
|
||||
|
||||
// https://learn.microsoft.com/en-us/windows/win32/menurc/resource-types
|
||||
#[cfg(windows)]
|
||||
|
||||
@@ -56,12 +56,12 @@ cargo +nightly-2025-06-23 xwin build --release --target aarch64-pc-windows-msvc
|
||||
After building the trampolines for all supported architectures:
|
||||
|
||||
```shell
|
||||
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-aarch64-console.exe
|
||||
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-aarch64-gui.exe
|
||||
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-x86_64-console.exe
|
||||
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-x86_64-gui.exe
|
||||
cp target/i686-pc-windows-msvc/release/uv-trampoline-console.exe trampolines/uv-trampoline-i686-console.exe
|
||||
cp target/i686-pc-windows-msvc/release/uv-trampoline-gui.exe trampolines/uv-trampoline-i686-gui.exe
|
||||
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-aarch64-console.exe
|
||||
cp target/aarch64-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-aarch64-gui.exe
|
||||
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-x86_64-console.exe
|
||||
cp target/x86_64-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-x86_64-gui.exe
|
||||
cp target/i686-pc-windows-msvc/release/uv-trampoline-console.exe ../uv-trampoline-builder/trampolines/uv-trampoline-i686-console.exe
|
||||
cp target/i686-pc-windows-msvc/release/uv-trampoline-gui.exe ../uv-trampoline-builder/trampolines/uv-trampoline-i686-gui.exe
|
||||
```
|
||||
|
||||
### Testing the trampolines
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ include = [
|
||||
{ path = "rust-toolchain.toml", format = ["sdist", "wheel"] },
|
||||
# this one isn't discovered by maturin because it's behind a feature flag
|
||||
{ path = "crates/uv-performance-memory-allocator/**/*", format = ["sdist", "wheel"] },
|
||||
{ path = "crates/uv-trampoline/trampolines/*", format = "sdist" },
|
||||
{ path = "crates/uv-trampoline-builder/trampolines/*", format = "sdist" },
|
||||
{ path = "LICENSE-APACHE", format = "sdist" },
|
||||
{ path = "LICENSE-MIT", format = "sdist" },
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user