Skip to content

Commit

Permalink
fix: vendor git2 openssl (#2481)
Browse files Browse the repository at this point in the history
I figure if we are already vending openssl we should do it here as well
  • Loading branch information
jdx authored Aug 20, 2024
1 parent 385c09b commit f78b25c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ zip = { version = "2", default-features = false, features = ["deflate"] }

[target.'cfg(unix)'.dependencies]
exec = "0.3"
nix = {version="0.29", features=["signal", "user"]}
nix = { version = "0.29", features = ["signal", "user"] }

[build-dependencies]
built = { version = "0.7", features = ["chrono", "git2"] }
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-tarball.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $Target = $args[0]
$Version = ./scripts/get-version.ps1
$BaseName = "mise-v$Version-$Env:OS-$Env:ARCH"

cargo build --release --features openssl/vendored,git2/vendored-libgit2 --target "$Target"
cargo build --release --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl --target "$Target"
mkdir -p dist/mise/bin
cp "target/$Target/release/mise.exe" dist/mise/bin/mise.exe
cp README.md dist/mise/README.md
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ case "$os-$arch" in
esac

if command -v cross >/dev/null; then
cross build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
cross build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
elif command -v zig >/dev/null; then
cargo zigbuild --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
cargo zigbuild --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
else
cargo build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2
cargo build --profile=serious --target "$RUST_TRIPLE" --features openssl/vendored,git2/vendored-libgit2,git2/vendored-openssl
fi
mkdir -p dist/mise/bin
mkdir -p dist/mise/man/man1
Expand Down

0 comments on commit f78b25c

Please sign in to comment.