Skip to content

Commit 9d2b00a

Browse files
committed
iterate on workflow syntax
1 parent 443fcea commit 9d2b00a

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/swift.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: Checkout Rust-Lightning and LDK-C-Bindings git
1414
run: |
15-
cd ci
15+
cd bindings/LDK
16+
ls -ll
17+
cd ../../ci
1618
git config --global user.email "[email protected]"
1719
git config --global user.name "LDK CI"
1820
# Note this is a different endpoint, as we need one non-upstream commit!
@@ -62,7 +64,7 @@ jobs:
6264
- name: Generate (copy for debugging) Swift bindings and copy batteries
6365
run: |
6466
pwd
65-
python ./ # Generate bindings
67+
python ./ # Generate bindings into ci subdirectory
6668
6769
# TODO: switch back to generation method after debugging
6870
# mkdir -p ci/LDKSwift/Sources/LDKSwift
@@ -72,12 +74,13 @@ jobs:
7274
env:
7375
LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
7476
LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift
75-
- name: Debug generated Swift bindings directory structure
76-
run: |
77-
python ci/walker.py bindings/LDK
7877
- name: Check that the latest auto-generated Swift files are in the repo
7978
run: |
79+
python ./ # Generate bindings into local directory
80+
python ci/walker.py bindings/LDK
8081
git diff --exit-code bindings/LDK ':(exclude)bindings/LDK/Bindings.swift'
82+
env:
83+
LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
8184
- name: Fix Swift files
8285
run: |
8386
cd ci
@@ -126,6 +129,8 @@ jobs:
126129
with:
127130
name: ci_archive
128131
path: ci
132+
- name: Set up Python
133+
uses: actions/setup-python@v2
129134
- name: Install Swift Toolchain
130135
run: |
131136
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
@@ -147,7 +152,7 @@ jobs:
147152
run: |
148153
python ci/toggle_address_sanitation_library.py on
149154
cd ci/LDKSwift
150-
../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
155+
../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
151156
env:
152157
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
153158
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a

0 commit comments

Comments
 (0)