Skip to content

Commit 7fe50d9

Browse files
committed
Merge #55: ci: Update rbmt + bump dependencies
5967508 ci(actions): Add github action to setup cargo-rbmt (valued mammal) 7ea5862 ci: Update setup-rbmt to cargo-rbmt-0.2.1, bump deps (valued mammal) Pull request description: ### Description Updates `cargo-rbmt` to match the `cargo-rbmt-0.2.1` tag, and adds an exclusion for the `stable` + `Cargo-minimal.lock` matrix combination (matching the existing `msrv` + `Cargo-recent.lock` exclusion). Also bumps `jsonrpc` to 0.20.0, `bitcoind` to 0.38.0, and the pinned stable toolchain to 1.95.0. ### Changelog notice Changed - Bump `cargo-rbmt` to 0.2.1 - Bump `jsonrpc` to 0.20.0 - Bump `bitcoind` to 0.38.0 - Update stable toolchain to 1.95.0 ACKs for top commit: luisschwab: ACK 5967508 Tree-SHA512: 3062e5378e1793e7b68bddc1a2dc987ddfe475ee828317b7d61fc91e1b40d0e46be3e7b4405fee5adc4b3036c3a665ca2d0d9aaddabcb28b4a162cc574d11262
2 parents da463f8 + 5967508 commit 7fe50d9

6 files changed

Lines changed: 246 additions & 246 deletions

File tree

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Setup cargo-rbmt
2+
description: Install cargo-rbmt
3+
inputs:
4+
rbmt-version:
5+
description: 'Git ref (commit, tag, or branch) of cargo-rbmt to install. If
6+
not provided, reads from rbmt-version file in repo root, or falls back to
7+
master.'
8+
required: false
9+
repo-url:
10+
description: 'Git repository URL to install cargo-rbmt from. Defaults to the
11+
primary upstream repository.'
12+
required: false
13+
default: 'https://git.rust-bitcoin.org/rust-bitcoin/rust-bitcoin-maintainer-tools'
14+
runs:
15+
using: "composite"
16+
steps:
17+
- name: Install cargo-rbmt
18+
shell: bash
19+
env:
20+
RBMT_VERSION: ${{ inputs.rbmt-version }}
21+
REPO_URL: ${{ inputs.repo-url }}
22+
run: |
23+
[ -z "$RBMT_VERSION" ] && [ -f rbmt-version ] && RBMT_VERSION=$(cat rbmt-version)
24+
[ -z "$RBMT_VERSION" ] && RBMT_VERSION=master
25+
[ -z "$REPO_URL" ] && REPO_URL='https://git.rust-bitcoin.org/rust-bitcoin/rust-bitcoin-maintainer-tools'
26+
cargo install --git "$REPO_URL" --rev "$RBMT_VERSION" cargo-rbmt --locked
27+
- name: Install Rust toolchains
28+
shell: bash
29+
run: cargo rbmt toolchains

.github/workflows/cont_integration.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
3030

3131
- name: Setup cargo-rbmt
32-
uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@6560b728ae6a81af9d92713b630ba26772fbd970
32+
uses: ./.github/actions/setup-rbmt
3333

3434
- name: "Run ${{ matrix.task }}"
3535
run: cargo rbmt ${{ matrix.task }}
@@ -46,6 +46,9 @@ jobs:
4646
# Exclude MSRV toolchain + `Cargo-recent.lock`
4747
- toolchain: msrv
4848
lockfile: recent
49+
# Exclude stable toolchain + `Cargo-minimal.lock`
50+
- toolchain: stable
51+
lockfile: minimal
4952

5053
steps:
5154
- name: Checkout repository
@@ -57,7 +60,7 @@ jobs:
5760
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
5861

5962
- name: Setup cargo-rbmt
60-
uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@6560b728ae6a81af9d92713b630ba26772fbd970
63+
uses: ./.github/actions/setup-rbmt
6164

6265
- name: Run tests
6366
run: cargo rbmt test --toolchain ${{ matrix.toolchain }} --lock-file ${{ matrix.lockfile }}

0 commit comments

Comments
 (0)