Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/actions/prepare/action.yml

This file was deleted.

48 changes: 18 additions & 30 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ jobs:
dep: [minimal, recent]
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: stable
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
- name: "Run tests"
run: cargo rbmt test stable --lock-file ${{ matrix.dep }}

Expand All @@ -33,11 +31,10 @@ jobs:
dep: [minimal, recent]
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: nightly
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
id: setup
- name: "Run tests"
run: cargo rbmt test nightly --lock-file ${{ matrix.dep }}
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt test nightly --lock-file ${{ matrix.dep }}

MSRV: # 2 jobs, one per lock file.
name: Test - MSRV toolchain
Expand All @@ -48,11 +45,11 @@ jobs:
dep: [minimal, recent]
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
with:
toolchain: "1.74.0"
toolchains: "1.74.0"
- name: "Run tests"
run: cargo rbmt test msrv --lock-file ${{ matrix.dep }}
run: cargo +1.74.0 rbmt test msrv --lock-file ${{ matrix.dep }}

Lint:
name: Lint - nightly toolchain
Expand All @@ -61,12 +58,10 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: nightly
components: clippy
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
id: setup
- name: "Run lint"
run: cargo rbmt lint
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt lint

Docs:
name: Docs - stable toolchain
Expand All @@ -75,9 +70,7 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: stable
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
- name: "Build docs"
run: cargo rbmt docs

Expand All @@ -88,11 +81,10 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: nightly
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
id: setup
- name: "Build docs.rs docs"
run: cargo rbmt docsrs
run: cargo +${{ steps.setup.outputs.nightly-version }} rbmt docsrs

Format: # 1 job, run cargo fmt directly.
name: Format - nightly toolchain
Expand All @@ -101,20 +93,16 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: nightly
components: rustfmt
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
id: setup
- name: "Check formatting"
run: cargo fmt --all -- --check
run: cargo +${{ steps.setup.outputs.nightly-version }} fmt --all -- --check

Integration: # 1 job, run bitcoin core integration tests using rbmt.
name: Integration - against bitcoind
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/prepare
with:
toolchain: stable
- uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
- name: "Run integration tests"
run: cargo rbmt integration
2 changes: 1 addition & 1 deletion rbmt-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
554c939298cac198aab6d9704890a832a2ed839b
16de1f1e65bf49e5451f1f491255bd898441c6ab
1 change: 1 addition & 0 deletions stable-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.93.0