mirror of
https://github.com/velopack/velopack.git
synced 2025-10-25 15:19:22 +00:00
Try removing cross-rs
This commit is contained in:
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -81,21 +81,21 @@ jobs:
|
||||
key: "rust-build-linux"
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
|
||||
cargo binstall cross --no-confirm --force
|
||||
rustup target add aarch64-unknown-linux-gnu
|
||||
sudo apt install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
|
||||
- name: Update Version
|
||||
shell: pwsh
|
||||
run: ./set-nbgv-version.ps1
|
||||
- name: Build Rust (x64)
|
||||
run: |
|
||||
cross build --release --target x86_64-unknown-linux-gnu
|
||||
cargo build --release --target x86_64-unknown-linux-gnu
|
||||
ldd ./target/x86_64-unknown-linux-gnu/release/update || true
|
||||
cp ./target/x86_64-unknown-linux-gnu/release/update ./target/UpdateNix_x64
|
||||
cp ./target/x86_64-unknown-linux-gnu/release/libvelopack_nodeffi.so ./target/velopack_nodeffi_linux_x64_gnu.node
|
||||
cp ./target/x86_64-unknown-linux-gnu/release/libvelopack_libc.so ./target/velopack_libc_linux_x64_gnu.so
|
||||
- name: Build Rust (arm64)
|
||||
run: |
|
||||
cross build --release --target aarch64-unknown-linux-gnu
|
||||
cargo build --release --target aarch64-unknown-linux-gnu
|
||||
ldd ./target/aarch64-unknown-linux-gnu/release/update || true
|
||||
cp ./target/aarch64-unknown-linux-gnu/release/update ./target/UpdateNix_arm64
|
||||
cp ./target/aarch64-unknown-linux-gnu/release/libvelopack_nodeffi.so ./target/velopack_nodeffi_linux_arm64_gnu.node
|
||||
|
||||
10
Cargo.lock
generated
10
Cargo.lock
generated
@@ -1414,6 +1414,15 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
|
||||
[[package]]
|
||||
name = "openssl-src"
|
||||
version = "300.3.2+3.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.103"
|
||||
@@ -1422,6 +1431,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
"openssl-src",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
@@ -27,7 +27,7 @@ cxx = "1.0"
|
||||
cxx-build = "1.0"
|
||||
velopack = { path = "src/lib-rust" }
|
||||
log = "0.4"
|
||||
native-tls = "0.2"
|
||||
native-tls = { version = "0.2", features = ["vendored"] }
|
||||
ureq = { version = "2.10", default-features = false, features = ["native-tls", "gzip"] }
|
||||
url = "2.5"
|
||||
semver = "1.0"
|
||||
|
||||
11
Cross.toml
11
Cross.toml
@@ -1,11 +0,0 @@
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
pre-build = [
|
||||
"dpkg --add-architecture $CROSS_DEB_ARCH",
|
||||
"apt-get update && apt-get install -y libssl-dev libssl-dev:$CROSS_DEB_ARCH",
|
||||
]
|
||||
|
||||
[target.aarch64-unknown-linux-gnu]
|
||||
pre-build = [
|
||||
"dpkg --add-architecture $CROSS_DEB_ARCH",
|
||||
"apt-get update && apt-get install -y libssl-dev libssl-dev:$CROSS_DEB_ARCH",
|
||||
]
|
||||
Reference in New Issue
Block a user