From 738a8fb70a2407a3681bc4597c2b4fcc9f93817b Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 14 Oct 2024 19:45:29 +0000 Subject: [PATCH 1/2] Bump default branch and CI branch references to 0.0.125-bindings --- .github/workflows/build.yml | 6 +++--- lightning-c-bindings/Cargo.toml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f78c28d..1815c3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: run: | git clone https://github.com/rust-bitcoin/rust-lightning cd rust-lightning - git checkout 0.0.124-bindings + git checkout 0.0.125-bindings - name: Fix Github Actions to not be broken run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings - name: Pin proc-macro and quote to meet MSRV @@ -106,7 +106,7 @@ jobs: run: | git clone https://github.com/rust-bitcoin/rust-lightning cd rust-lightning - git checkout 0.0.124-bindings + git checkout 0.0.125-bindings - name: Fix Github Actions to not be broken run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings - name: Fetch MacOS SDK @@ -153,7 +153,7 @@ jobs: run: | git clone https://github.com/rust-bitcoin/rust-lightning cd rust-lightning - git checkout 0.0.124-bindings + git checkout 0.0.125-bindings - name: Rebuild bindings using Apple clang, and check the sample app builds + links run: ./genbindings.sh ./rust-lightning true - name: Rebuild bindings using upstream clang, and check the sample app builds + links diff --git a/lightning-c-bindings/Cargo.toml b/lightning-c-bindings/Cargo.toml index 0d4ef54..3590b2a 100644 --- a/lightning-c-bindings/Cargo.toml +++ b/lightning-c-bindings/Cargo.toml @@ -23,12 +23,12 @@ bitcoin = { version = "0.32", default-features = false } bech32 = { version = "0.9", default-features = false } secp256k1 = { version = "0.29", features = ["global-context", "recovery"] } # Note that the following line is matched by genbindings to update the path -lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } -lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } -lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } -lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } -lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } -lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.124-bindings", default-features = false } +lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } +lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } +lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } +lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } +lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } +lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.125-bindings", default-features = false } # Always force panic=abort, further options are set in the genbindings.sh build script [profile.dev] From 9a061d25285540cd950f01de7ebd59e64b6e293d Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 14 Oct 2024 20:08:58 +0000 Subject: [PATCH 2/2] Fix `compiler_builtins` pin for macOS builds --- genbindings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genbindings.sh b/genbindings.sh index 258f666..2d31089 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -397,7 +397,7 @@ function REALLY_PIN_CC { fi rm -f "$CARGO_REGISTRY_CACHE/"cc-*.crate [ -f ./cc-1.0.79.crate ] && mv ./cc-1.0.79.crate "$CARGO_REGISTRY_CACHE/" - rm -f "$CARGO_REGISTRY_CACHE/"compiler_builtins-0.1.11*.crate + rm -f "$CARGO_REGISTRY_CACHE/"compiler_builtins-*.crate [ -f ./compiler_builtins-0.1.109.crate ] && mv ./compiler_builtins-0.1.109.crate "$CARGO_REGISTRY_CACHE/" else echo "Couldn't find cargo cache, build-std builds are likely to fail!"