Skip to content

Commit

Permalink
Merge pull request #130 from TheBlueMatt/main
Browse files Browse the repository at this point in the history
0.0.125
  • Loading branch information
TheBlueMatt authored Oct 15, 2024
2 parents 0cb2569 + 9a061d2 commit 0653124
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion genbindings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
12 changes: 6 additions & 6 deletions lightning-c-bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 0653124

Please sign in to comment.