iterate on workflow syntax

Author: arik-so

.github/workflows/swift.yml

@@ -32,19 +32,6 @@ jobs:
                     # git checkout 1bb5ae1b34aeb74009b7b4b5ebefc957cddc30a6
                     echo "ldk-c-bindings commit hash:"
                     git rev-parse HEAD
-                    cd ..
-            -   name: Install Swift Toolchain
-                run: |
-                    curl --verbose -L -o swift-5.6-RELEASE-ubuntu20.04.tar.gz https://download.swift.org/swift-5.6-release/ubuntu2004/swift-5.6-RELEASE/swift-5.6-RELEASE-ubuntu20.04.tar.gz
-                    echo "Sha sum: $(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')"
-                    if [ "$(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')" != "${EXPECTED_SWIFT_SHASUM}" ]; then
-                      echo "Bad hash"
-                      echo "Contents: \n$(cat swift-5.6-RELEASE-ubuntu20.04.tar.gz)" 
-                      exit 1
-                    fi
-                    tar xvvf swift-5.6-RELEASE-ubuntu20.04.tar.gz
-                env:
-                    EXPECTED_SWIFT_SHASUM: 3f0d926bfc08eea00a69b1d992f2ab5e08155d97476096a3ef959fe7c4cbd58b
             -   name: Install native Rust toolchain, Valgrind, and build utilities
                 run: |
                     sudo apt-get update
@@ -59,14 +46,6 @@ jobs:
                     pwd
                     ./genbindings.sh ../rust-lightning true
                     cd ..
-            -   name: Check that the latest headers are in the swift repo
-                run: |
-                    git diff  --exit-code bindings/LDK ':(exclude)bindings/LDK/Bindings.swift'
-            -   name: Debug bindings target directory structure
-                run: |
-                    cd ci
-                    pwd
-                    python ./walker.py ldk-c-bindings/lightning-c-bindings/target
             -   name: Copy new headers into bindings
                 run: |
                     cd ci
@@ -93,13 +72,28 @@ jobs:
                 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
+            -   name: Debug generated Swift bindings directory structure
+                run: |
+                    python ci/walker.py bindings/LDK
+            -   name: Check that the latest auto-generated Swift files are in the repo
+                run: |
+                    git diff --exit-code bindings/LDK ':(exclude)bindings/LDK/Bindings.swift'
             -   name: Fix Swift files
                 run: |
                     cd ci
                     python ./fix_swift_imports.py
-            -   name: Debug CI directory structure
+            -   name: Install Swift Toolchain
                 run: |
-                    python ci/walker.py ci/
+                    curl --verbose -L -o swift-5.6-RELEASE-ubuntu20.04.tar.gz https://download.swift.org/swift-5.6-release/ubuntu2004/swift-5.6-RELEASE/swift-5.6-RELEASE-ubuntu20.04.tar.gz
+                    echo "Sha sum: $(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')"
+                    if [ "$(sha256sum swift-5.6-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')" != "${EXPECTED_SWIFT_SHASUM}" ]; then
+                      echo "Bad hash"
+                      echo "Contents: \n$(cat swift-5.6-RELEASE-ubuntu20.04.tar.gz)" 
+                      exit 1
+                    fi
+                    tar xvvf swift-5.6-RELEASE-ubuntu20.04.tar.gz
+                env:
+                    EXPECTED_SWIFT_SHASUM: 3f0d926bfc08eea00a69b1d992f2ab5e08155d97476096a3ef959fe7c4cbd58b
             -   name: Build Swift bindings package
                 run: |
                     cd ci/LDKSwift