Skip to content

Commit 566c772

Browse files
committed
Make run_tests Docker command automatically do cargo builds
1 parent feb9ae2 commit 566c772

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/swift.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
cd rust-lightning
2121
# git checkout origin/2021-03-java-bindings-base
2222
# git checkout v0.0.100
23-
git checkout 557c7143fddde4a3879bb209a71f8f574c604caf
23+
git checkout 8966f8d3d4911e034621c6d3c3d20140d3a7e76a
2424
echo "rust-lightning commit hash:"
2525
git rev-parse HEAD
2626
cd ..

ci/docker_shell.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ LDK_SUBDIRECTORY="$LDK_DIRECTORY/lightning-c-bindings"
1010

1111
if [[ "${MOUNT_CI_FOLDER}" = "true" ]]; then
1212
# use for direct ci folder access
13-
# note: batteries will be missing. In parent directory, run `cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift`
1413
cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift
1514
docker run --name "swift-generator-shell" -e MOUNTED_CI_FOLDER=true -i -v $PROJECT_DIRECTORY/ci:/ci -v $LDK_DIRECTORY:/ldk-c-bindings --rm -t swift-generation-ci /bin/bash
1615
elif [ "${MOUNT_CI_FOLDER}" = "false" ]; then

ci/run_tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ set -x
77
# remove everything except the batteries folder from the sources
88
find ./LDKSwift/Sources/LDKSwift/* -maxdepth 0 -not -name 'batteries' | xargs -r rm -r
99

10-
# rm -i -r ./LDKSwift/Sources/LDKSwift/^(batteries)*
10+
# build the bindings
11+
pushd /ldk-c-bindings/lightning-c-bindings
12+
cargo build
13+
popd
1114

1215
pushd ../
1316
# working within /

0 commit comments

Comments
 (0)