change to use vendored openssl

This commit is contained in:
Dongdong Zhou 2021-10-06 14:21:31 +01:00
parent 9b86d918f8
commit 30d17de443
3 changed files with 16 additions and 12 deletions

View File

@ -16,12 +16,6 @@ jobs:
- uses: actions/checkout@v2
- name: Install ARM target
run: rustup update && rustup target add aarch64-apple-darwin
- name: Install OpenSSL
run: brew install openssl@1.1
# - name: Test
# run: cargo test --release
# - name: Test ARM
# run: cargo test --release --target=aarch64-apple-darwin
- name: Make DMG
run: make dmg-universal
- name: Upload Application

20
Cargo.lock generated
View File

@ -507,7 +507,7 @@ dependencies = [
"clicolors-control",
"lazy_static 1.4.0",
"libc",
"parking_lot 0.6.4",
"parking_lot 0.11.2",
"regex",
"termios",
"unicode-width",
@ -1638,9 +1638,9 @@ dependencies = [
[[package]]
name = "git2"
version = "0.13.21"
version = "0.13.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "659cd14835e75b64d9dba5b660463506763cf0aa6cb640aeeb0e98d841093490"
checksum = "2a8057932925d3a9d9e4434ea016570d37420ddb1ceed45a174d577f24ed6700"
dependencies = [
"bitflags",
"libc",
@ -2265,9 +2265,9 @@ checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
[[package]]
name = "libgit2-sys"
version = "0.12.22+1.1.0"
version = "0.12.24+1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89c53ac117c44f7042ad8d8f5681378dfbc6010e49ec2c0d1f11dfedc7a4a1c3"
checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c"
dependencies = [
"cc",
"libc",
@ -2902,6 +2902,15 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "openssl-src"
version = "111.16.0+1.1.1l"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.66"
@ -2911,6 +2920,7 @@ dependencies = [
"autocfg 1.0.1",
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]

View File

@ -19,4 +19,4 @@ serde_json = "1.0.59"
anyhow = "1.0.32"
home = "0.5.3"
toml = "0.5.6"
git2 = "0.13.20"
git2 = { version = "0.13.23", features = ["vendored-openssl"] }