Skip to content

Commit

Permalink
Merge #1085: fix ci: bump ahash dep and add bitcoind macos arm64 bina…
Browse files Browse the repository at this point in the history
…ry hash

8991210 Add macos arm64 binary to bitcoind download (edouardparis)
c21004b 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 8991210

Tree-SHA512: 082b2896abcb600e5e6ab4ec24cd56b4994c843e9a478a7e5e1515dbaa357cfa1714270a1a4b135d17caa9a0ed3bebad714df0f28e3c6a341503238ce6156a7c
  • Loading branch information
darosior committed May 2, 2024
2 parents bd262b6 + 8991210 commit 6b22577
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions gui/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions gui/src/bitcoind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ pub const VERSION: &str = VERSIONS[0];
#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
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"))]
pub const SHA256SUM: &str = "a5b7d206384a8100058d3f2e2f02123a8e49e83f523499e70e86e121a4897d5b";

Expand All @@ -41,6 +44,11 @@ pub fn download_filename() -> String {
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"))]
fn download_filename() -> String {
format!("bitcoin-{}-x86_64-linux-gnu.tar.gz", &VERSION)
Expand Down

0 comments on commit 6b22577

Please sign in to comment.