diff --git a/.github/workflows/trampoline.yaml b/.github/workflows/trampoline.yaml index a324a5a77..fe1ec9840 100644 --- a/.github/workflows/trampoline.yaml +++ b/.github/workflows/trampoline.yaml @@ -39,7 +39,7 @@ jobs: target: ${{ matrix.target }} - name: Build trampoline binary - run: cd crates/pixi_trampoline && cargo build --release --target ${{ matrix.target }} + run: cargo build --release --target ${{ matrix.target }} --package pixi_trampoline - name: Move trampoline binary on windows if: startsWith(matrix.name, 'Windows') diff --git a/Cargo.lock b/Cargo.lock index db11cc2af..6fcd26f14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -959,6 +959,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix", + "windows-sys 0.59.0", +] + [[package]] name = "darling" version = "0.20.10" @@ -3544,6 +3554,15 @@ dependencies = [ "url", ] +[[package]] +name = "pixi_trampoline" +version = "0.1.0" +dependencies = [ + "ctrlc", + "serde", + "serde_json", +] + [[package]] name = "pixi_utils" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 133c049ad..32667f249 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,4 @@ [workspace] -exclude = ["crates/pixi_trampoline"] members = ["crates/*"] [workspace.package]