Skip to content

Commit

Permalink
Merge pull request #165 from TheBlueMatt/main
Browse files Browse the repository at this point in the history 
Cut 0.0.124.0
  • Loading branch information
@TheBlueMatt
TheBlueMatt authored Sep 5, 2024
2 parents a596b45 + db83033 commit c86e77c
Show file tree
Hide file tree
Showing 1,773 changed files with 268,875 additions and 166,415 deletions.
45 changes: 19 additions & 26 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Rebuild C bindings without STD
run: |
cd ldk-c-bindings
Expand Down Expand Up @@ -138,13 +136,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Rebuild C bindings with STD
run: |
cd ldk-c-bindings
Expand Down Expand Up @@ -185,11 +181,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
git checkout 0.0.124
- name: Fetch MacOS SDK
run: |
curl -o Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz https://bitcoincore.org/depends-sources/sdks/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
Expand Down Expand Up @@ -340,13 +336,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Pin proc-macro and quote to meet MSRV
run: |
cd ldk-c-bindings/c-bindings-gen
Expand Down Expand Up @@ -403,13 +397,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Pin proc-macro and quote to meet MSRV
run: |
cd ldk-c-bindings/c-bindings-gen
Expand Down Expand Up @@ -532,11 +524,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
git checkout 0.0.124
- name: Fetch MacOS SDK
run: |
curl -o Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz https://bitcoincore.org/depends-sources/sdks/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
Expand Down Expand Up @@ -661,22 +653,23 @@ jobs:
- name: Install cbindgen
run: |
. $HOME/.cargo/env
cargo install cbindgen
git clone https://github.com/eqrion/cbindgen
cd cbindgen/
git checkout v0.20.0
cargo update -p indexmap --precise "1.6.2" --verbose
cargo install --locked --path .
- name: Checkout Rust-Lightning and LDK-C-Bindings git
run: |
git config --global user.email "[email protected]"
git config --global user.name "LDK CI"
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
. $HOME/.cargo/env
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Checkout Android AAR binaries and artifacts
run: |
# Gitweb only allows snapshots of folders by providing the object hash, which we have to extract:
Expand Down
3 changes: 2 additions & 1 deletion bindingstypes.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class TypeInfo:
def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_hu_ty, c_ty, is_const, passed_as_ptr, is_ptr, nonnull_ptr, var_name, arr_len, arr_access, subty=None, contains_trait=False):
def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_hu_ty, c_ty, is_const, passed_as_ptr, is_ptr, nonnull_ptr, var_name, arr_len, arr_access, is_trait, subty=None, contains_trait=False):
self.is_native_primitive = is_native_primitive
self.rust_obj = rust_obj
self.java_ty = java_ty
Expand All @@ -16,6 +16,7 @@ def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_
self.subty = subty
self.pass_by_ref = is_ptr
self.requires_clone = None
self.is_trait = is_trait
self.contains_trait = contains_trait

def get_full_rust_ty(self):
Expand Down
Loading

0 comments on commit c86e77c

Please sign in to comment.