Skip to content

Commit 737bcb1

Browse files
committed
Merge #694: Depend on the new bitcoind-json-rpc group of crates
9cf60c8 Depend on the new bitcoind-json-rpc group of crates (Tobin C. Harding) f4752d1 CI: Add fuzz to CRATES (Tobin C. Harding) de2370b Reduce coding convention attributes (Tobin C. Harding) 61a028a CI: Fix workflow docs (Tobin C. Harding) Pull request description: There is an effort to improve the state of affairs in regards to integration testing extensively against multiple versions of Bitcoin Core. As part of this do: - Depend on the new `rust-bitcoind-json-rpc` crates - Run the integration tests against most versions of Core since 0.17.1 (Note the latest supported version is currently 26.0) ref: https://crates.io/search?q=bitcoind-json-rpc ACKs for top commit: apoelstra: ACK 9cf60c8 successfully ran local tests Tree-SHA512: 296c978703addfa7e14541a78d4a302b23a48e6cefaf95a854f1a08d4598f68846c73775f1cfdc2a2788bcda1fe03ca73a686efbc88ed6fea5769f52569225a4
2 parents a6e897f + 9cf60c8 commit 737bcb1

File tree

11 files changed

+134
-549
lines changed

11 files changed

+134
-549
lines changed

.github/workflows/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ Run from `rust.yml` unless stated otherwise. Total 11 jobs.
1515
3. `Nightly - minimal`
1616
4. `Nightly - recent`
1717
5. `MSRV - minimal`
18-
6. `Lint`
19-
7. `Docs`
20-
8. `Docsrs`
21-
9. `Bench`
22-
10. `Format`
23-
10. `Int-tests`
24-
11. `Embedded`
18+
6. `MSRV - recent`
19+
7. `Lint`
20+
8. `Docs`
21+
9. `Docsrs`
22+
10. `Bench`
23+
11. `Format`
24+
12. `Int-tests`
25+
13. `Embedded`

.github/workflows/rust.yml

+32-13
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
- name: "Run test script"
168168
run: ./maintainer-tools/ci/run_task.sh bench
169169

170-
Format: # 1 jobs, run cargo fmt directly.
170+
Format: # 1 job, run cargo fmt directly.
171171
name: Format - nightly toolchain
172172
runs-on: ubuntu-latest
173173
strategy:
@@ -182,20 +182,39 @@ jobs:
182182
- name: "Check formatting"
183183
run: cargo +nightly fmt --all -- --check
184184

185-
Int-tests:
186-
name: Integration tests
185+
Integration: # 1 job for each bitcoind version we support.
186+
name: Integration tests - stable toolchain
187187
runs-on: ubuntu-latest
188+
strategy:
189+
fail-fast: false
190+
matrix:
191+
feature:
192+
[
193+
"26_0",
194+
"25_2",
195+
"25_1",
196+
"25_0",
197+
"24_2",
198+
"24_1",
199+
"24_0_1",
200+
"23_2",
201+
"23_1",
202+
"23_0",
203+
"22_1",
204+
"22_0",
205+
"0_21_2",
206+
"0_20_2",
207+
"0_19_1",
208+
"0_18_1",
209+
"0_17_1",
210+
]
188211
steps:
189-
- name: Checkout Crate
190-
uses: actions/checkout@v2
191-
- name: Checkout Toolchain
192-
uses: actions-rs/toolchain@v1
193-
with:
194-
profile: minimal
195-
toolchain: stable
196-
override: true
197-
- name: Running integration tests
198-
run: ./contrib/integration_test.sh
212+
- name: "Checkout repo"
213+
uses: actions/checkout@v4
214+
- name: "Select toolchain"
215+
uses: dtolnay/rust-toolchain@stable
216+
- name: "Run integration tests"
217+
run: cd bitcoind-tests && cargo test --features=${{ matrix.feature }}
199218

200219
Embedded:
201220
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)