Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try removing cross-rs

Browse Source
This commit is contained in:
Caelan Sayler
2024-10-20 11:55:11 +01:00
committed by Caelan
parent 4bd1d5ec37
commit b820282d98
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View File

@@ -81,21 +81,21 @@ jobs:
key: "rust-build-linux" key: "rust-build-linux"
- name: Install Dependencies - name: Install Dependencies
run: | run: |
curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash rustup target add aarch64-unknown-linux-gnu
cargo binstall cross --no-confirm --force sudo apt install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
- name: Update Version - name: Update Version
shell: pwsh shell: pwsh
run: ./set-nbgv-version.ps1 run: ./set-nbgv-version.ps1
- name: Build Rust (x64) - name: Build Rust (x64)
run: | 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 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/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_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 cp ./target/x86_64-unknown-linux-gnu/release/libvelopack_libc.so ./target/velopack_libc_linux_x64_gnu.so
- name: Build Rust (arm64) - name: Build Rust (arm64)
run: | 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 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/update ./target/UpdateNix_arm64
cp ./target/aarch64-unknown-linux-gnu/release/libvelopack_nodeffi.so ./target/velopack_nodeffi_linux_arm64_gnu.node cp ./target/aarch64-unknown-linux-gnu/release/libvelopack_nodeffi.so ./target/velopack_nodeffi_linux_arm64_gnu.node

10
Cargo.lock generated
View File

@@ -1414,6 +1414,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" 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]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.103" version = "0.9.103"
@@ -1422,6 +1431,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
"openssl-src",
"pkg-config", "pkg-config",
"vcpkg", "vcpkg",
] ]

2
Cargo.toml
View File

@@ -27,7 +27,7 @@ cxx = "1.0"
cxx-build = "1.0" cxx-build = "1.0"
velopack = { path = "src/lib-rust" } velopack = { path = "src/lib-rust" }
log = "0.4" 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"] } ureq = { version = "2.10", default-features = false, features = ["native-tls", "gzip"] }
url = "2.5" url = "2.5"
semver = "1.0" semver = "1.0"

11
Cross.toml
View File

@@ -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",
]