From 2ef44dd22efd7150bb57cc0c387ba8cc72cf3583 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 11:53:54 +0100 Subject: [PATCH 01/21] fix: also install cargo-dist on build-local --- .github/workflows/release.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 923efe91b..ab8f5e461 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,8 +134,12 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - name: Install dist - run: ${{ matrix.install_dist }} + - name: Install cargo-dist from git + uses: baptiste0928/cargo-install@v3 + with: + crate: cargo-dist + git: https://github.com/ruben-arts/cargo-dist + branch: feature/allow_binaries_in_root_of_tar # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 From 2715eaa1485eeb4803656605805bb2d4b87e9bdb Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 11:55:10 +0100 Subject: [PATCH 02/21] test: unpacked uploads --- .github/workflows/release.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab8f5e461..c6eb7678b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -266,6 +266,31 @@ jobs: name: artifacts-dist-manifest path: dist-manifest.json + # Unpack binaries, required for setup-pixi + - name: Unpack binaries + run: | + mkdir -p unpacked-artifacts + for artifact in target/distrib/*.tar.gz; do + # Extract the base name without the extension + base_name=$(basename "$artifact" .tar.gz) + + # Create a directory for the specific artifact + mkdir -p unpacked-artifacts/$base_name + + # Extract the artifact contents + tar -xvf --strip-component=1 "$artifact" -C unpacked-artifacts/$base_name + + # Move the pixi binary to the base name + mv unpacked-artifacts/$base_name/pixi unpacked-artifacts/$base_name + done + + # Test single binary upload + - name: Upload unpacked artifact for pixi-aarch64-unknown-linux-musl + uses: actions/upload-artifact@v4 + with: + name: pixi-aarch64-unknown-linux-musl + path: unpacked-artifacts/pixi-aarch64-unknown-linux-musl + # Create a GitHub Release while uploading all files to it announce: needs: From 7e8a570e629e785ef3e2e6ecf7389be62933d076 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 14:07:42 +0100 Subject: [PATCH 03/21] rebase cargo-dist on release we worked with --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 30e80637a..97dd243d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -362,7 +362,7 @@ tokio = { workspace = true, features = ["rt"] } # Config for 'dist' [workspace.metadata.dist] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.26.0-prerelease.3" +cargo-dist-version = "0.25.1" # CI backends to support ci = "github" # The installers to generate for each app From 77affff5fc42d2a6ac6a95455f1c93304007f24e Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 15:31:09 +0100 Subject: [PATCH 04/21] fix: use cached cargo-dist and speedup testing with only the linux build --- .github/workflows/release.yml | 13 +++++++------ Cargo.toml | 18 +++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6eb7678b..c43ce288e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,8 @@ jobs: uses: actions/upload-artifact@v4 with: name: cargo-dist-cache - path: ~/.cargo/bin/dist + # TODO: revert after switching back to released dist + path: ~/.cargo-install/cargo-dist/bin/dist # sure would be cool if github gave us proper conditionals... # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible # functionality based on whether this is a pull_request, and whether it's from a fork. @@ -134,12 +135,12 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - name: Install cargo-dist from git - uses: baptiste0928/cargo-install@v3 + - name: Install cached dist + uses: actions/download-artifact@v4 with: - crate: cargo-dist - git: https://github.com/ruben-arts/cargo-dist - branch: feature/allow_binaries_in_root_of_tar + name: cargo-dist-cache + path: ~/.cargo/bin/ + - run: chmod +x ~/.cargo/bin/dist # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 diff --git a/Cargo.toml b/Cargo.toml index 97dd243d5..b7b29156d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -321,12 +321,15 @@ nix = { workspace = true, features = ["poll", "term"] } pixi_pty = { path = "crates/pixi_pty" } signal-hook = { workspace = true } +# TODO revert these change, these are for quicker testing [profile.dist] -codegen-units = 1 +codegen-units = 16 +#codegen-units = 1 inherits = "release" lto = "fat" opt-level = 3 -strip = "symbols" +strip = false +# strip = "symbols" [profile.ci] codegen-units = 16 @@ -372,13 +375,14 @@ windows-archive = ".zip" # The archive format to use for non-windows builds (defaults .tar.xz) unix-archive = ".tar.gz" # Target platforms to build apps for (Rust target-triple syntax) +# TODO: disabled for quicker testing targets = [ - "aarch64-apple-darwin", - "aarch64-unknown-linux-musl", - "aarch64-pc-windows-msvc", - "x86_64-apple-darwin", + # "aarch64-apple-darwin", + # "aarch64-unknown-linux-musl", + # "aarch64-pc-windows-msvc", + # "x86_64-apple-darwin", "x86_64-unknown-linux-musl", - "x86_64-pc-windows-msvc", + # "x86_64-pc-windows-msvc", ] # Whether CI should trigger releases with dispatches instead of tag pushes dispatch-releases = true From eb5a576d2fa2dce3cc92c36dd364299e81fc572e Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 15:48:24 +0100 Subject: [PATCH 05/21] Revert back to full set of binaries as test worked --- Cargo.toml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7b29156d..97dd243d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -321,15 +321,12 @@ nix = { workspace = true, features = ["poll", "term"] } pixi_pty = { path = "crates/pixi_pty" } signal-hook = { workspace = true } -# TODO revert these change, these are for quicker testing [profile.dist] -codegen-units = 16 -#codegen-units = 1 +codegen-units = 1 inherits = "release" lto = "fat" opt-level = 3 -strip = false -# strip = "symbols" +strip = "symbols" [profile.ci] codegen-units = 16 @@ -375,14 +372,13 @@ windows-archive = ".zip" # The archive format to use for non-windows builds (defaults .tar.xz) unix-archive = ".tar.gz" # Target platforms to build apps for (Rust target-triple syntax) -# TODO: disabled for quicker testing targets = [ - # "aarch64-apple-darwin", - # "aarch64-unknown-linux-musl", - # "aarch64-pc-windows-msvc", - # "x86_64-apple-darwin", + "aarch64-apple-darwin", + "aarch64-unknown-linux-musl", + "aarch64-pc-windows-msvc", + "x86_64-apple-darwin", "x86_64-unknown-linux-musl", - # "x86_64-pc-windows-msvc", + "x86_64-pc-windows-msvc", ] # Whether CI should trigger releases with dispatches instead of tag pushes dispatch-releases = true From 95daf3d78007e88089c407a12c45834271b83ae1 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 16:02:59 +0100 Subject: [PATCH 06/21] Enable uploading unpacked binaries --- .github/workflows/release.yml | 36 ++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c43ce288e..c2cfece1f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -279,19 +279,49 @@ jobs: mkdir -p unpacked-artifacts/$base_name # Extract the artifact contents - tar -xvf --strip-component=1 "$artifact" -C unpacked-artifacts/$base_name + tar -xvf "$artifact" -C unpacked-artifacts/$base_name # Move the pixi binary to the base name mv unpacked-artifacts/$base_name/pixi unpacked-artifacts/$base_name done - # Test single binary upload + # Upload unpacked artifacts, not sure how to do this in one go as you have to name the artifact - name: Upload unpacked artifact for pixi-aarch64-unknown-linux-musl uses: actions/upload-artifact@v4 with: - name: pixi-aarch64-unknown-linux-musl + name: artifacts-pixi-aarch64-unknown-linux-musl path: unpacked-artifacts/pixi-aarch64-unknown-linux-musl + - name: Upload unpacked artifact for pixi-x86_64-unknown-linux-musl + uses: actions/upload-artifact@v4 + with: + name: artifacts-pixi-x86_64-unknown-linux-musl + path: unpacked-artifacts/pixi-x86_64-unknown-linux-musl + + - name: Upload unpacked artifact for pixi-aarch64-apple-darwin + uses: actions/upload-artifact@v4 + with: + name: artifacts-pixi-aarch64-apple-darwin + path: unpacked-artifacts/pixi-aarch64-apple-darwin + + - name: Upload unpacked artifact for pixi-x86_64-apple-darwin + uses: actions/upload-artifact@v4 + with: + name: artifacts-pixi-x86_64-apple-darwin + path: unpacked-artifacts/pixi-x86_64-apple-darwin + + - name: Upload unpacked artifact for pixi-x86_64-pc-windows-msvc.exe + uses: actions/upload-artifact@v4 + with: + name: artifacts-pixi-x86_64-pc-windows-msvc.exe + path: unpacked-artifacts/pixi-x86_64-pc-windows-msvc.exe + + - name: Upload unpacked artifact for pixi-aarch64-pc-windows-msvc.exe + uses: actions/upload-artifact@v4 + with: + name: artifacts-pixi-aarch64-pc-windows-msvc.exe + path: unpacked-artifacts/pixi-aarch64-pc-windows-msvc.exe + # Create a GitHub Release while uploading all files to it announce: needs: From bae51b50d1fda15b5024ae8044214e936107df7c Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 16:39:40 +0100 Subject: [PATCH 07/21] fix: improve unpacking code. --- .github/workflows/release.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2cfece1f..8d760250b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -268,21 +268,28 @@ jobs: path: dist-manifest.json # Unpack binaries, required for setup-pixi - - name: Unpack binaries + - name: Unpack binaries tar run: | mkdir -p unpacked-artifacts for artifact in target/distrib/*.tar.gz; do + echo artifact: $artifact # Extract the base name without the extension base_name=$(basename "$artifact" .tar.gz) - # Create a directory for the specific artifact - mkdir -p unpacked-artifacts/$base_name - # Extract the artifact contents - tar -xvf "$artifact" -C unpacked-artifacts/$base_name + tar -xvf "$artifact" pixi > unpacked-artifacts/$base_name + chmod +x unpacked-artifacts/$base_name + done + - name: Unpack binaries zip + run: | + for artifact in target/distrib/*.zip; do + echo artifact: $artifact + # Extract the base name without the extension + base_name=$(basename "$artifact" .zip) - # Move the pixi binary to the base name - mv unpacked-artifacts/$base_name/pixi unpacked-artifacts/$base_name + # Extract the artifact contents + # Because zip is only used on windows we can assume the binary is an exe + unzip -p "$artifact" pixi > unpacked-artifacts/$base_name.exe done # Upload unpacked artifacts, not sure how to do this in one go as you have to name the artifact From 30eac54a76b5b732c271b2a088217ae4e0a0aa11 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 16:48:39 +0100 Subject: [PATCH 08/21] update cargo version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c904bc40..6d1387c57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.39.1" +version = "0.39.2-rc0" dependencies = [ "ahash", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 97dd243d5..993d6a438 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.39.1" +version = "0.39.2-rc0" [features] default = ["rustls-tls"] From 717ebd0384b21c6bcfed3e4a18b2d29eef584fa6 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 16:59:07 +0100 Subject: [PATCH 09/21] fix: rebuild forked dist on all platforms --- .github/workflows/release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d760250b..8663f6c21 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,12 +135,13 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - name: Install cached dist - uses: actions/download-artifact@v4 + # Install fork of dist to allow for binaries in the root of the tarball + - name: Install cargo-dist from git + uses: baptiste0928/cargo-install@v3 with: - name: cargo-dist-cache - path: ~/.cargo/bin/ - - run: chmod +x ~/.cargo/bin/dist + crate: cargo-dist + git: https://github.com/ruben-arts/cargo-dist + branch: feature/allow_binaries_in_root_of_tar # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 From 66c0bf695f243b1f15af26def19615f774073c94 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 17:25:49 +0100 Subject: [PATCH 10/21] fix: prerelease tag for msi --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d1387c57..07b1fda09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.39.2-rc0" +version = "0.39.2-prerelease.0" dependencies = [ "ahash", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 993d6a438..34f9c9433 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.39.2-rc0" +version = "0.39.2-prerelease.0" [features] default = ["rustls-tls"] From 19f7150fdb6471c4f532f9fc80f2889c47facb7f Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 18:24:55 +0100 Subject: [PATCH 11/21] only unpack pixi artifacts --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8663f6c21..d3775c12f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -272,7 +272,7 @@ jobs: - name: Unpack binaries tar run: | mkdir -p unpacked-artifacts - for artifact in target/distrib/*.tar.gz; do + for artifact in target/distrib/pixi-*.tar.gz; do echo artifact: $artifact # Extract the base name without the extension base_name=$(basename "$artifact" .tar.gz) @@ -283,7 +283,7 @@ jobs: done - name: Unpack binaries zip run: | - for artifact in target/distrib/*.zip; do + for artifact in target/distrib/pixi-*.zip; do echo artifact: $artifact # Extract the base name without the extension base_name=$(basename "$artifact" .zip) From 3ba6103250fc5aadede5aaeea33044c3b9cf0997 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Tue, 10 Dec 2024 21:56:25 +0100 Subject: [PATCH 12/21] fix: windows artifact name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3775c12f..b4be77fe0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -290,7 +290,7 @@ jobs: # Extract the artifact contents # Because zip is only used on windows we can assume the binary is an exe - unzip -p "$artifact" pixi > unpacked-artifacts/$base_name.exe + unzip -p "$artifact" pixi.exe > unpacked-artifacts/$base_name.exe done # Upload unpacked artifacts, not sure how to do this in one go as you have to name the artifact From 1e49339fb9cdfb29706d89b0a71ffbecc606d079 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 09:36:34 +0100 Subject: [PATCH 13/21] fix: tar unpacking and creating release --- .github/workflows/release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4be77fe0..079b8f9e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -271,6 +271,7 @@ jobs: # Unpack binaries, required for setup-pixi - name: Unpack binaries tar run: | + set -e pipefail # fail if any command fails mkdir -p unpacked-artifacts for artifact in target/distrib/pixi-*.tar.gz; do echo artifact: $artifact @@ -278,11 +279,11 @@ jobs: base_name=$(basename "$artifact" .tar.gz) # Extract the artifact contents - tar -xvf "$artifact" pixi > unpacked-artifacts/$base_name - chmod +x unpacked-artifacts/$base_name + tar -xvf "$artifact" -O pixi > unpacked-artifacts/$base_name done - name: Unpack binaries zip run: | + set -e pipefail # fail if any command fails for artifact in target/distrib/pixi-*.zip; do echo artifact: $artifact # Extract the base name without the extension @@ -367,4 +368,4 @@ jobs: # Write and read notes from a file to avoid quoting breaking things echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt - gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --draft true --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* + gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --draft --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* From 6e4ca73063b55b77901048028119a4a2961b2b25 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 11:35:22 +0100 Subject: [PATCH 14/21] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 34f9c9433..c4781bbf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.39.2-prerelease.0" +version = "0.39.2-prerelease.1" [features] default = ["rustls-tls"] From 39573815b6b6059824135dab0887d13441fe1f61 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 12:51:14 +0100 Subject: [PATCH 15/21] expose secrets --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 079b8f9e5..27b2c1d92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,6 +128,10 @@ jobs: CODESIGN_CERTIFICATE: ${{ secrets.CODESIGN_CERTIFICATE }} CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.CODESIGN_CERTIFICATE_PASSWORD }} CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }} + CODESIGN_ADDITIONAL_ARGS: ${{ variables.CODESIGN_ADDITIONAL_ARGS }} + APPLEID_TEAMID: ${{ secrets.APPLEID_TEAMID }} + APPLEID_USERNAME: ${{ secrets.APPLEID_USERNAME }} + APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} steps: - name: enable windows longpaths run: | @@ -279,7 +283,7 @@ jobs: base_name=$(basename "$artifact" .tar.gz) # Extract the artifact contents - tar -xvf "$artifact" -O pixi > unpacked-artifacts/$base_name + tar -xvf "$artifact" -O pixi > unpacked-artifacts/$base_name done - name: Unpack binaries zip run: | From e8963d72d13d7a162df09d4f81f3c1fa8aff09de Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 12:53:14 +0100 Subject: [PATCH 16/21] bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/pixi_consts/src/consts.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07b1fda09..d38907d43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.39.2-prerelease.0" +version = "0.39.2-prerelease.2" dependencies = [ "ahash", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index c4781bbf2..54f929094 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.39.2-prerelease.1" +version = "0.39.2-prerelease.2" [features] default = ["rustls-tls"] diff --git a/crates/pixi_consts/src/consts.rs b/crates/pixi_consts/src/consts.rs index ae9f0a2d7..ddd720040 100644 --- a/crates/pixi_consts/src/consts.rs +++ b/crates/pixi_consts/src/consts.rs @@ -14,7 +14,7 @@ pub const CONFIG_FILE: &str = "config.toml"; pub const PIXI_DIR: &str = ".pixi"; pub const PIXI_VERSION: &str = match option_env!("PIXI_VERSION") { Some(v) => v, - None => "0.39.1", + None => "0.39.2", }; pub const PREFIX_FILE_NAME: &str = "pixi_env_prefix"; pub const ENVIRONMENTS_DIR: &str = "envs"; From 0d6e68cc4990810d22772322afef3f01d5119eff Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 12:54:59 +0100 Subject: [PATCH 17/21] variables -> vars --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27b2c1d92..49a6ec20e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,7 +128,7 @@ jobs: CODESIGN_CERTIFICATE: ${{ secrets.CODESIGN_CERTIFICATE }} CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.CODESIGN_CERTIFICATE_PASSWORD }} CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }} - CODESIGN_ADDITIONAL_ARGS: ${{ variables.CODESIGN_ADDITIONAL_ARGS }} + CODESIGN_ADDITIONAL_ARGS: ${{ vars.CODESIGN_ADDITIONAL_ARGS }} APPLEID_TEAMID: ${{ secrets.APPLEID_TEAMID }} APPLEID_USERNAME: ${{ secrets.APPLEID_USERNAME }} APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} From 32e5441a32f259878c6149b3ea3058d6006453f4 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 13:31:55 +0100 Subject: [PATCH 18/21] Disable optimizations for faster testing --- Cargo.toml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 54f929094..62b56946b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -322,11 +322,17 @@ pixi_pty = { path = "crates/pixi_pty" } signal-hook = { workspace = true } [profile.dist] -codegen-units = 1 +# codegen-units = 1 +#inherits = "release" +#lto = "fat" +#opt-level = 3 +#strip = "symbols" +# codegen-units = 1 +codegen-units = 16 inherits = "release" -lto = "fat" -opt-level = 3 -strip = "symbols" +lto = false +opt-level = 0 +strip = false [profile.ci] codegen-units = 16 From b7086bfea008080323b8f5309b9be3eb66570887 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 13:54:08 +0100 Subject: [PATCH 19/21] Enable optimizations again --- Cargo.toml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 62b56946b..54f929094 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -322,17 +322,11 @@ pixi_pty = { path = "crates/pixi_pty" } signal-hook = { workspace = true } [profile.dist] -# codegen-units = 1 -#inherits = "release" -#lto = "fat" -#opt-level = 3 -#strip = "symbols" -# codegen-units = 1 -codegen-units = 16 +codegen-units = 1 inherits = "release" -lto = false -opt-level = 0 -strip = false +lto = "fat" +opt-level = 3 +strip = "symbols" [profile.ci] codegen-units = 16 From ca1a22c53d957ba6fc1343abd65f359b2ff5f772 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 15:05:28 +0100 Subject: [PATCH 20/21] Apply suggestions from code review --- Cargo.toml | 2 +- crates/pixi_consts/src/consts.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 54f929094..97dd243d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.39.2-prerelease.2" +version = "0.39.1" [features] default = ["rustls-tls"] diff --git a/crates/pixi_consts/src/consts.rs b/crates/pixi_consts/src/consts.rs index ddd720040..ae9f0a2d7 100644 --- a/crates/pixi_consts/src/consts.rs +++ b/crates/pixi_consts/src/consts.rs @@ -14,7 +14,7 @@ pub const CONFIG_FILE: &str = "config.toml"; pub const PIXI_DIR: &str = ".pixi"; pub const PIXI_VERSION: &str = match option_env!("PIXI_VERSION") { Some(v) => v, - None => "0.39.2", + None => "0.39.1", }; pub const PREFIX_FILE_NAME: &str = "pixi_env_prefix"; pub const ENVIRONMENTS_DIR: &str = "envs"; From 82927afa541959ce668aeac31d803e378d7f7245 Mon Sep 17 00:00:00 2001 From: Ruben Arts Date: Wed, 11 Dec 2024 15:07:55 +0100 Subject: [PATCH 21/21] Update Cargo.lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index d38907d43..1c904bc40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.39.2-prerelease.2" +version = "0.39.1" dependencies = [ "ahash", "assert_matches",