nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1085: fix ci: bump ahash dep and add bitcoind macos arm64 binary hash

Browse Source 
89912105734175e0f2a5e53eb6165b12055cc2c1 Add macos arm64 binary to bitcoind download (edouardparis)
c21004badb10d00990da088d4df659b25263a23f bump ahash dependency to fix macos build (edouardparis)

Pull request description:

  - bump ahash dependency to fix macos build
  - ci requires now macos aarch64 for the liana-gui tests on macos, sha256sum is added for bitcoind-26.1-arm64-apple-darwin.tar.gz (https://bitcoincore.org/bin/bitcoin-core-26.1/)

ACKs for top commit:
  darosior:
    ACK 89912105734175e0f2a5e53eb6165b12055cc2c1

Tree-SHA512: 082b2896abcb600e5e6ab4ec24cd56b4994c843e9a478a7e5e1515dbaa357cfa1714270a1a4b135d17caa9a0ed3bebad714df0f28e3c6a341503238ce6156a7c
This commit is contained in:
Antoine Poinsot 2024-05-02 14:43:39 +02:00
commit 6b225777b2
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.7" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",

6
gui/Cargo.lock generated
View File

@ -108,9 +108,9 @@ dependencies = [
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.7" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
@ -1978,7 +1978,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash 0.8.11",
"allocator-api2", "allocator-api2",
] ]

8
gui/src/bitcoind.rs
View File

@ -30,6 +30,9 @@ pub const VERSION: &str = VERSIONS[0];
#[cfg(all(target_os = "macos", target_arch = "x86_64"))] #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
pub const SHA256SUM: &str = "acb50edd20692a9d023de12da573b64ca0fd9b4e9a2b88d1251020a3022b0f27"; pub const SHA256SUM: &str = "acb50edd20692a9d023de12da573b64ca0fd9b4e9a2b88d1251020a3022b0f27";
#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
pub const SHA256SUM: &str = "8a8e415763b7ffd5988153cf03967d812eca629016dd3b0ddf6da3ab6f4a3621";
#[cfg(all(target_os = "linux", target_arch = "x86_64"))] #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
pub const SHA256SUM: &str = "a5b7d206384a8100058d3f2e2f02123a8e49e83f523499e70e86e121a4897d5b"; pub const SHA256SUM: &str = "a5b7d206384a8100058d3f2e2f02123a8e49e83f523499e70e86e121a4897d5b";
@ -41,6 +44,11 @@ pub fn download_filename() -> String {
format!("bitcoin-{}-x86_64-apple-darwin.tar.gz", &VERSION) format!("bitcoin-{}-x86_64-apple-darwin.tar.gz", &VERSION)
} }
#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
pub fn download_filename() -> String {
format!("bitcoin-{}-arm64-apple-darwin.tar.gz", &VERSION)
}
#[cfg(all(target_os = "linux", target_arch = "x86_64"))] #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
fn download_filename() -> String { fn download_filename() -> String {
format!("bitcoin-{}-x86_64-linux-gnu.tar.gz", &VERSION) format!("bitcoin-{}-x86_64-linux-gnu.tar.gz", &VERSION)