iterate on workflow syntax

Author: arik-so

.github/workflows/swift.yml

@@ -35,8 +35,6 @@ jobs:
                     cd ..
             -   name: Install Swift Toolchain
                 run: |
-                    pwd
-                    cd 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
@@ -61,6 +59,9 @@ jobs:
                     pwd
                     ./genbindings.sh ../rust-lightning true
                     cd ..
+            -   name: Check that the latest headers are in the swift repo
+                run: |
+                    git diff --no-index --exit-code ci/bindings/LDK bindings/LDK
             -   name: Debug bindings target directory structure
                 run: |
                     cd ci
@@ -102,7 +103,7 @@ jobs:
             -   name: Build Swift bindings package
                 run: |
                     cd ci/LDKSwift
-                    ../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift build
+                    ../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift build
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
                     LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
@@ -111,7 +112,7 @@ jobs:
                 run: |
                     python ci/toggle_address_sanitation_library.py off
                     cd ci/LDKSwift
-                    ../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
+                    ../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
                 env:
                     LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
                     LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
@@ -121,9 +122,6 @@ jobs:
                 with:
                     name: ci_archive
                     path: ci
-            -   name: Check that the latest headers are in the swift repo
-                run: |
-                    git diff --exit-code
 
     test_bindings_with_sanitizer:
         runs-on: ubuntu-20.04
@@ -134,6 +132,18 @@ jobs:
                 with:
                     name: ci_archive
                     path: ci
+            -   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 Valgrind and build utilities
                 run: |
                     sudo apt-get update