Skip to content

Commit 2f26bb2

Browse files
committed
Merge #65: Consolidate CI
f783c1d Consolidate CI (Nick Johnson) Pull request description: Folded the readme docs inline since those have a tendency to deviate despite our best efforts. ACKs for top commit: tcharding: ACK f783c1d Tree-SHA512: d95e889f4bf3f03146155b691969e1e87da0a0d8bc08637c0d9306d9907b21992bb41823c9d5af65c812928f039bf8517a013aadc45dff795b90ce2be03cf83c
2 parents 3a5d42a + f783c1d commit 2f26bb2

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

.github/workflows/README.md

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

.github/workflows/rust.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
--- # rust-psbt CI: If you edit this file please update README.md
1+
---
2+
# rust-psbt CI
3+
#
4+
# CI job and task structure is optimized for developer debugging. Not runner
5+
# minutes or parallelism.
6+
27
on: # yamllint disable-line rule:truthy
38
push:
49
branches:
510
- master
6-
- 'test-ci/**'
711
pull_request:
812

9-
name: Continuous integration
13+
name: Continuous Integration
1014

1115
jobs:
1216
Stable: # 2 jobs, one per lock file.
@@ -19,8 +23,9 @@ jobs:
1923
steps:
2024
- uses: actions/checkout@v6
2125
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
26+
id: setup
2227
- name: "Run tests"
23-
run: cargo rbmt test stable --lock-file ${{ matrix.dep }}
28+
run: cargo +${{ steps.setup.outputs.stable-version }} rbmt test stable --lock-file ${{ matrix.dep }}
2429

2530
Nightly: # 2 jobs, one per lock file.
2631
name: Test - nightly toolchain
@@ -71,8 +76,9 @@ jobs:
7176
steps:
7277
- uses: actions/checkout@v6
7378
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
79+
id: setup
7480
- name: "Build docs"
75-
run: cargo rbmt docs
81+
run: cargo +${{ steps.setup.outputs.stable-version }} rbmt docs
7682

7783
Docsrs:
7884
name: Docs - nightly toolchain

rbmt-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16de1f1e65bf49e5451f1f491255bd898441c6ab
1+
257e19f400ab1bfa51c2051b5551d92f75b5f738

0 commit comments

Comments
 (0)