Merge #40: Update rbmt to cargo subcommand version

50ea2f6 Update rbmt to cargo subcommand version (Nick Johnson)

Pull request description:

ACKs for top commit:
  tcharding:
    ACK 50ea2f6

Tree-SHA512: 0ff25d017a391560db5228b2edb4481fc32e8cf7ab55f2a59abc1d1e74feda0e04a2afec9b9070d3e8eeac22256ccfec513c88afad9394869db469c00c800c65

Author: tcharding

.github/workflows/rust.yml

@@ -13,12 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       nightly_version: ${{ steps.read_toolchain.outputs.nightly_version }}
+      rbmt_version: ${{ steps.read_toolchain.outputs.rbmt_version }}
     steps:
       - name: "Checkout repo"
         uses: actions/checkout@v4
       - name: "Read toolchain versions"
         id: read_toolchain
-        run: echo "nightly_version=$(cat nightly-version)" >> $GITHUB_OUTPUT
+        run: |
+          echo "nightly_version=$(cat nightly-version)" >> $GITHUB_OUTPUT
+          echo "rbmt_version=$(cat rbmt-version)" >> $GITHUB_OUTPUT
 
   Stable:                       # 2 jobs, one per lock file.
     name: Test - stable toolchain
@@ -33,9 +36,9 @@ jobs:
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@stable
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat rbmt-version) cargo-rbmt
       - name: "Run tests"
-        run: rbmt test stable --lock-file ${{ matrix.dep }}
+        run: cargo rbmt test stable --lock-file ${{ matrix.dep }}
 
   Nightly:                      # 2 jobs, one per lock file.
     name: Test - nightly toolchain
@@ -53,9 +56,9 @@ jobs:
         with:
           toolchain: ${{ needs.Prepare.outputs.nightly_version }}
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
       - name: "Run tests"
-        run: rbmt test nightly --lock-file ${{ matrix.dep }}
+        run: cargo rbmt test nightly --lock-file ${{ matrix.dep }}
 
   MSRV:                         # 2 jobs, one per lock file.
     name: Test - MSRV toolchain
@@ -70,13 +73,13 @@ jobs:
       - name: "Install stable toolchain"
         uses: dtolnay/rust-toolchain@stable
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat rbmt-version) cargo-rbmt
       - name: "Install MSRV toolchain"
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: "1.74.0"
       - name: "Run tests"
-        run: rbmt test msrv --lock-file ${{ matrix.dep }}
+        run: cargo rbmt test msrv --lock-file ${{ matrix.dep }}
 
   Lint:
     name: Lint - nightly toolchain
@@ -94,9 +97,9 @@ jobs:
       - name: "Install clippy"
         run: rustup component add clippy
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
       - name: "Run lint"
-        run: rbmt lint
+        run: cargo rbmt lint
 
   Docs:
     name: Docs - stable toolchain
@@ -109,9 +112,9 @@ jobs:
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@stable
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat rbmt-version) cargo-rbmt
       - name: "Build docs"
-        run: rbmt docs
+        run: cargo rbmt docs
 
   Docsrs:
     name: Docs - nightly toolchain
@@ -127,9 +130,9 @@ jobs:
         with:
           toolchain: ${{ needs.Prepare.outputs.nightly_version }}
       - name: "Install rbmt"
-        run: ./contrib/install-rbmt.sh
+        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
       - name: "Build docs.rs docs"
-        run: rbmt docsrs
+        run: cargo rbmt docsrs
 
   Format:                       #  1 job, run cargo fmt directly.
     name: Format - nightly toolchain

contrib/install-rbmt.sh

@@ -6,7 +6,7 @@ _default:
 
 # Install rbmt (Rust Bitcoin Maintainer Tools).
 @_install-rbmt:
-  rustup run stable {{justfile_directory()}}/contrib/install-rbmt.sh
+  cargo install --quiet --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat {{justfile_directory()}}/rbmt-version) cargo-rbmt
 
 # Cargo check everything.
 check:
@@ -36,12 +36,12 @@ docsrs *flags:
 # Update the recent and minimal lock files using rbmt.
 [group('tools')]
 @update-lock-files: _install-rbmt
-  rustup run {{NIGHTLY_VERSION}} rbmt lock
+  rustup run {{NIGHTLY_VERSION}} cargo rbmt lock
 
 # Run CI tasks with rbmt.
 [group('ci')]
 @ci task toolchain="stable" lock="recent": _install-rbmt
-  RBMT_LOG_LEVEL=quiet rustup run {{toolchain}} rbmt --lock-file {{lock}} {{task}}
+  RBMT_LOG_LEVEL=quiet rustup run {{toolchain}} cargo rbmt --lock-file {{lock}} {{task}}
 
 # Test crate.
 [group('ci')]

justfile

@@ -1 +1 @@
-4eb8e3b752288a3ac9b24aa94fc4c29a532644af
+95a2fd3300933a531f89488a08ddb6df9c9561ab