Skip to content

Commit bba8c8d

Browse files
committed
Switch to shared setup-rbmt action
1 parent f6f8638 commit bba8c8d

File tree

4 files changed

+20
-68
lines changed

4 files changed

+20
-68
lines changed

.github/actions/prepare/action.yml

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

.github/workflows/rust.yml

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
dep: [minimal, recent]
1919
steps:
2020
- uses: actions/checkout@v6
21-
- uses: ./.github/actions/prepare
22-
with:
23-
toolchain: stable
21+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
2422
- name: "Run tests"
2523
run: cargo rbmt test stable --lock-file ${{ matrix.dep }}
2624

@@ -33,11 +31,10 @@ jobs:
3331
dep: [minimal, recent]
3432
steps:
3533
- uses: actions/checkout@v6
36-
- uses: ./.github/actions/prepare
37-
with:
38-
toolchain: nightly
34+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
35+
id: setup
3936
- name: "Run tests"
40-
run: cargo rbmt test nightly --lock-file ${{ matrix.dep }}
37+
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt test nightly --lock-file ${{ matrix.dep }}
4138

4239
MSRV: # 2 jobs, one per lock file.
4340
name: Test - MSRV toolchain
@@ -48,11 +45,11 @@ jobs:
4845
dep: [minimal, recent]
4946
steps:
5047
- uses: actions/checkout@v6
51-
- uses: ./.github/actions/prepare
48+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
5249
with:
53-
toolchain: "1.74.0"
50+
toolchains: "1.74.0"
5451
- name: "Run tests"
55-
run: cargo rbmt test msrv --lock-file ${{ matrix.dep }}
52+
run: cargo +1.74.0 rbmt test msrv --lock-file ${{ matrix.dep }}
5653

5754
Lint:
5855
name: Lint - nightly toolchain
@@ -61,12 +58,10 @@ jobs:
6158
fail-fast: false
6259
steps:
6360
- uses: actions/checkout@v6
64-
- uses: ./.github/actions/prepare
65-
with:
66-
toolchain: nightly
67-
components: clippy
61+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
62+
id: setup
6863
- name: "Run lint"
69-
run: cargo rbmt lint
64+
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt lint
7065

7166
Docs:
7267
name: Docs - stable toolchain
@@ -75,9 +70,7 @@ jobs:
7570
fail-fast: false
7671
steps:
7772
- uses: actions/checkout@v6
78-
- uses: ./.github/actions/prepare
79-
with:
80-
toolchain: stable
73+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
8174
- name: "Build docs"
8275
run: cargo rbmt docs
8376

@@ -88,11 +81,10 @@ jobs:
8881
fail-fast: false
8982
steps:
9083
- uses: actions/checkout@v6
91-
- uses: ./.github/actions/prepare
92-
with:
93-
toolchain: nightly
84+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
85+
id: setup
9486
- name: "Build docs.rs docs"
95-
run: cargo rbmt docsrs
87+
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt docsrs
9688

9789
Format: # 1 job, run cargo fmt directly.
9890
name: Format - nightly toolchain
@@ -101,20 +93,16 @@ jobs:
10193
fail-fast: false
10294
steps:
10395
- uses: actions/checkout@v6
104-
- uses: ./.github/actions/prepare
105-
with:
106-
toolchain: nightly
107-
components: rustfmt
96+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
97+
id: setup
10898
- name: "Check formatting"
109-
run: cargo fmt --all -- --check
99+
run: cargo +${{ steps.setup.outputs.nightly-version }} fmt --all -- --check
110100

111101
Integration: # 1 job, run bitcoin core integration tests using rbmt.
112102
name: Integration - against bitcoind
113103
runs-on: ubuntu-latest
114104
steps:
115105
- uses: actions/checkout@v6
116-
- uses: ./.github/actions/prepare
117-
with:
118-
toolchain: stable
106+
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
119107
- name: "Run integration tests"
120108
run: cargo rbmt integration

rbmt-version

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

stable-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.93.0

0 commit comments

Comments
 (0)