Skip to content

Commit 5c672b1

Browse files
committed
Run payjoin-ffi workflows in CI
Run rust test and lint checks in the main rust workflow. The python checks are added as a separate workflow, which only runs if python files were touched.
1 parent d9aa818 commit 5c672b1

File tree

7 files changed

+18
-73
lines changed

7 files changed

+18
-73
lines changed

payjoin-ffi/.github/workflows/build-python.yml renamed to .github/workflows/python.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Copied from [bdk-ffi](https://github.com/bitcoindevkit/bdk-ffi/blob/master/.github/workflows/test-python.yaml)
22
name: Build and Test Python
3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
paths:
6+
- payjoin-ffi/python/**
47

58
jobs:
69
build-wheels-and-test:
@@ -11,7 +14,7 @@ jobs:
1114
image: redis:7-alpine
1215
defaults:
1316
run:
14-
working-directory: python
17+
working-directory: payjoin-ffi/python
1518
strategy:
1619
matrix:
1720
include:
@@ -63,7 +66,7 @@ jobs:
6366
runs-on: macos-13
6467
defaults:
6568
run:
66-
working-directory: python
69+
working-directory: payjoin-ffi/python
6770
strategy:
6871
matrix:
6972
python:

contrib/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
DEPS="recent minimal"
5-
CRATES="payjoin payjoin-cli payjoin-directory"
5+
CRATES="payjoin payjoin-cli payjoin-directory payjoin-ffi"
66

77
for dep in $DEPS; do
88
cargo --version

contrib/test_local.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
CRATES="payjoin payjoin-cli payjoin-directory"
4+
CRATES="payjoin payjoin-cli payjoin-directory payjoin-ffi"
55

66
cargo --version
77
rustc --version

payjoin-ffi/.github/workflows/build.yml

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

payjoin-ffi/contrib/lint.sh

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

payjoin-ffi/contrib/test.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
RUST_VERSION=$(rustc --version | awk '{print $2}')
5+
6+
if [[ ! "$RUST_VERSION" =~ ^1\.63\. ]]; then
7+
cargo test --package payjoin-ffi --verbose --features=_danger-local-https,_test-utils
8+
else
9+
echo "Skipping payjoin-ffi tests for Rust version $RUST_VERSION (MSRV)"
10+
fi

payjoin-ffi/lefthook.yml

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

0 commit comments

Comments
 (0)