Merge pull request #62 from lightningdevkit/2022-07-streamline-workflows

Streamline Github CI workflows

Author: arik-so

.github/actions/install-dependencies/action.yml

@@ -1,5 +1,14 @@
 name: Install Dependencies
 description: Install dependencies
+inputs:
+    destination:
+        description: Location to check out rust-lightning and ldk-c-bindings repositories
+        default: '.'
+        required: true
+    configureRustNightly:
+        description: Flag whether or not to install rust, which is not necessary on Ubuntu machines
+        default: 'true'
+        required: false
 runs:
     using: composite
     steps:
@@ -11,16 +20,18 @@ runs:
             shell: bash
             run: |
                 echo `pwd`
-                mkdir -p ./bindings/artifacts/bin
-                git clone --branch 2022-07-109-java-bindings https://github.com/TheBlueMatt/rust-lightning ./bindings/artifacts/rust-lightning
-                git clone --branch v0.0.109.0 https://github.com/lightningdevkit/ldk-c-bindings ./bindings/artifacts/ldk-c-bindings
+                mkdir -p ${{ inputs.destination }}/bin
+                git clone --branch 2022-07-109-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
+                git clone --branch v0.0.109.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
         -   name: Install Rust, required targets
+            if: ${{ inputs.configureRustNightly == 'true' }}
             shell: bash
             run: |
                 rustup toolchain install nightly
                 rustup target add aarch64-apple-darwin aarch64-apple-ios x86_64-apple-ios
                 rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
         -   name: Load Cache
+            if: ${{ inputs.configureRustNightly == 'true' }}
             uses: actions/cache@v3
             with:
                 path: |
@@ -34,12 +45,12 @@ runs:
             shell: bash
             run: |
                 export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
-                pushd bindings/artifacts/ldk-c-bindings
+                pushd ${{ inputs.destination }}/ldk-c-bindings
                 ./genbindings.sh ../rust-lightning true
                 popd
         -   name: Generate Swift Bindings
             shell: bash
             run: |
                 python3 ./
             env:
-                LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: bindings/artifacts/ldk-c-bindings/lightning-c-bindings/include/lightning.h
+                LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ${{ inputs.destination }}/ldk-c-bindings/lightning-c-bindings/include/lightning.h

.github/workflows/build-xcframework-parallel-archives.yml

@@ -42,6 +42,8 @@ jobs:
                 uses: actions/checkout@v2
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
+                with:
+                    destination: ./bindings/artifacts
             -   name: Build
                 id: build
                 uses: ./.github/actions/archive-framework

.github/workflows/build-xcframework-parallel-libldk.yml

@@ -50,6 +50,8 @@ jobs:
                 uses: actions/checkout@v2
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
+                with:
+                    destination: ./bindings/artifacts
             -   name: Build libldk.a
                 shell: bash
                 run:

.github/workflows/build-xcframework-sequential.yml

@@ -29,6 +29,8 @@ jobs:
                 uses: actions/checkout@v2
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
+                with:
+                    destination: ./bindings/artifacts
             -   name: Generate XCFramework
                 uses: ./.github/actions/generate-xcframework
             -   name: Create XCFramework artifact

.github/workflows/release-framework.yml

@@ -32,6 +32,8 @@ jobs:
                 uses: actions/checkout@v2
             -   name: Install Dependencies
                 uses: ./.github/actions/install-dependencies
+                with:
+                    destination: ./bindings/artifacts
             -   name: Generate XCFramework
                 uses: ./.github/actions/generate-xcframework
             -   name: Create XCFramework artifact

.github/workflows/swift.yml

@@ -15,56 +15,25 @@ jobs:
         steps:
             -   name: Checkout source code
                 uses: actions/checkout@v2
-            -   name: Checkout Rust-Lightning and LDK-C-Bindings git
-                run: |
-                    cd ./ci
-                    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://git.bitcoin.ninja/rust-lightning
-                    # git clone https://github.com/TheBlueMatt/rust-lightning
-                    git clone --branch 2022-07-109-java-bindings https://github.com/TheBlueMatt/rust-lightning
-                    cd rust-lightning
-                    echo "rust-lightning commit hash:"
-                    git rev-parse HEAD
-                    cd ..
-                    git clone --branch v0.0.109.0 https://github.com/lightningdevkit/ldk-c-bindings
-                    # git clone https://github.com/TheBlueMatt/ldk-c-bindings
-                    cd ldk-c-bindings
-                    echo "ldk-c-bindings commit hash:"
-                    git rev-parse HEAD
             -   name: Install native Rust toolchain, Valgrind, and build utilities
                 run: |
                     sudo apt-get update
                     sudo apt-get -y dist-upgrade
                     sudo apt-get -y install cargo valgrind lld git g++ clang curl
-            -   name: Install cbindgen
-                run: cargo install --force cbindgen
-            -   name: Regenerate C bindings
-                run: |
-                    pwd
-                    cd ci/ldk-c-bindings
-                    pwd
-                    ./genbindings.sh ../rust-lightning true
-                    cd ..
+            -   name: Install Dependencies
+                uses: ./.github/actions/install-dependencies
+                with:
+                    destination: ./ci
+                    configureRustNightly: false
+                env:
+                    LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift/bindings
             -   name: Copy new headers into bindings
                 run: |
                     cd ci
                     mkdir -p ./LDKSwift/Sources/LDKHeaders/include
                     cp ldk-c-bindings/lightning-c-bindings/include/*.h ./LDKSwift/Sources/LDKHeaders/include/
                     cp ldk-c-bindings/ldk-net/ldk_net.h ./LDKSwift/Sources/LDKHeaders/include/
                     cp ldk-c-bindings/ldk-net/ldk_net.c ./LDKSwift/Sources/LDKHeaders/
-            -   name: Generate (copy for debugging) Swift bindings and copy batteries
-                run: |
-                    pwd
-                    python3 ./ # Generate bindings into ci subdirectory
-
-                    # TODO: switch back to generation method after debugging
-                    # mkdir -p ci/LDKSwift/Sources/LDKSwift
-                    # cp -a bindings/LDK/. ci/LDKSwift/Sources/LDKSwift
-                env:
-                    LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
-                    LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift/bindings
             -   name: Check that the latest auto-generated Swift files are in the repo
                 run: |
                     python3 ./ # Generate bindings into local directory