Skip to content

Commit 90f1a94

Browse files
committed
iterate on workflow syntax
1 parent fa8862d commit 90f1a94

File tree

2 files changed

+29
-120
lines changed

2 files changed

+29
-120
lines changed

.github/workflows/swift-prep.yml

Lines changed: 0 additions & 98 deletions
This file was deleted.

.github/workflows/swift.yml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: Checkout Rust-Lightning and LDK-C-Bindings git
1414
run: |
15+
ci ci
1516
git config --global user.email "[email protected]"
1617
git config --global user.name "LDK CI"
1718
# Note this is a different endpoint, as we need one non-upstream commit!
@@ -58,60 +59,69 @@ jobs:
5859
cd ..
5960
- name: Debug bindings target directory structure
6061
run: |
61-
python ci/walker.py ldk-c-bindings/lightning-c-bindings/target
62+
python ./walker.py ldk-c-bindings/lightning-c-bindings/target
6263
- name: Copy new headers into bindings
6364
run: |
64-
mkdir -p ci/LDKSwift/Sources/LDKHeaders/include
65-
cp ldk-c-bindings/lightning-c-bindings/include/*.h ci/LDKSwift/Sources/LDKHeaders/include/
66-
cp ldk-c-bindings/ldk-net/ldk_net.h ci/LDKSwift/Sources/LDKHeaders/include/
67-
cp ldk-c-bindings/ldk-net/ldk_net.c ci/LDKSwift/Sources/LDKHeaders/
65+
mkdir -p ./LDKSwift/Sources/LDKHeaders/include
66+
cp ldk-c-bindings/lightning-c-bindings/include/*.h ./LDKSwift/Sources/LDKHeaders/include/
67+
cp ldk-c-bindings/ldk-net/ldk_net.h ./LDKSwift/Sources/LDKHeaders/include/
68+
cp ldk-c-bindings/ldk-net/ldk_net.c ./LDKSwift/Sources/LDKHeaders/
6869
- name: Set up Python
6970
uses: actions/setup-python@v2
7071
- name: Fix header files
7172
run: |
72-
python ci/fix_header_includes.py
73+
python ./fix_header_includes.py
7374
- name: Generate (copy for debugging) Swift bindings and copy batteries
7475
run: |
76+
cd ../
7577
python ./ # Generate bindings
7678
7779
# TODO: switch back to generation method after debugging
7880
# mkdir -p ci/LDKSwift/Sources/LDKSwift
7981
# cp -a bindings/LDK/. ci/LDKSwift/Sources/LDKSwift
8082
8183
cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift
84+
cd ci
8285
env:
8386
LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ldk-c-bindings/lightning-c-bindings/include/lightning.h
8487
LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift
8588
- name: Fix Swift files
8689
run: |
87-
python ci/fix_swift_imports.py
90+
python ./fix_swift_imports.py
8891
- name: Debug CI directory structure
8992
run: |
90-
python ci/walker.py ci/
93+
python ./walker.py ci/
9194
- name: Build Swift bindings package
9295
run: |
93-
cd ci/LDKSwift
94-
../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift build
95-
cd ../../
96+
cd LDKSwift
97+
../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift build
98+
cd ../
9699
env:
97100
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
98101
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
99102
RUST_BACKTRACE: 1
103+
104+
- name: Archive code coverage results
105+
uses: actions/upload-artifact@v3
106+
with:
107+
name: ci_archive
108+
path: ./
109+
100110
- name: Test Swift bindings package without address sanitizer
101111
run: |
102-
python ci/toggle_address_sanitation_library.py off
103-
cd ci/LDKSwift
104-
../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
105-
cd ../../
112+
python ./toggle_address_sanitation_library.py off
113+
cd LDKSwift
114+
../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
115+
cd ../
106116
env:
107117
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
108118
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
109119
RUST_BACKTRACE: 1
110120
- name: Test Swift bindings package with address sanitizer
111121
run: |
112-
python ci/toggle_address_sanitation_library.py on
113-
cd ci/LDKSwift
114-
../../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
122+
python ./toggle_address_sanitation_library.py on
123+
cd LDKSwift
124+
../swift-5.6-RELEASE-ubuntu20.04/usr/bin/swift test -v
115125
env:
116126
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
117127
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
@@ -121,12 +131,9 @@ jobs:
121131
run: |
122132
git diff --exit-code
123133
124-
test_bindings_with_sanitizer_prep:
125-
uses: ./.github/workflows/swift-prep.yml
126-
127134
test_bindings_with_sanitizer:
128135
runs-on: ubuntu-20.04
129-
needs: test_bindings_with_sanitizer_prep
136+
needs: check_bindings
130137
steps:
131138
- name: Test Swift bindings package without address sanitizer
132139
run: |

0 commit comments

Comments
 (0)