Merge #43: Upgrade rbmt to simplify integration config

a881b81 Simplify integration test imports (Nick Johnson)
b567e53 Refactor Prepare job to action (Nick Johnson)
47182b0 Upgrade github actions (Nick Johnson)
0b7c977 Remove stale docs (Nick Johnson)
eac43cc Upgrade rbmt and simplify integration configs (Nick Johnson)
76e820c Bump serde versions to match bitcoin and fix min version issue (Nick Johnson)

Pull request description:

  Moving the Prepare job to an action for one less job and easy to share configs.

ACKs for top commit:
  tcharding:
    ACK a881b81

Tree-SHA512: df681e0c30db87fd7fd076f091f96752640928f1ce5361837528e84e8beec8305b389a3641a1675075512a8c09068312fa69560ae5d1ae395f7914b97a82461d

Author: tcharding

.github/actions/prepare/action.yml

@@ -0,0 +1,39 @@
+name: 'Prepare Rust Environment'
+description: 'Setup Rust toolchain and install RBMT'
+inputs:
+  toolchain:
+    description: 'Rust toolchain to use (nightly reads from nightly-version file)'
+    required: false
+    default: 'stable'
+  components:
+    description: 'Rust components to install (e.g., clippy, rustfmt)'
+    required: false
+    default: ''
+runs:
+  using: "composite"
+  steps:
+    - name: "Determine toolchain"
+      id: toolchain
+      shell: bash
+      run: |
+        if [ "${{ inputs.toolchain }}" = "nightly" ]; then
+          TOOLCHAIN="$(cat nightly-version)"
+        else
+          TOOLCHAIN="${{ inputs.toolchain }}"
+        fi
+        echo "version=$TOOLCHAIN" >> $GITHUB_OUTPUT
+
+    - name: "Setup stable toolchain for RBMT"
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: stable
+
+    - name: "Install RBMT"
+      shell: bash
+      run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev "$(cat rbmt-version)" cargo-rbmt
+
+    - name: "Setup requested toolchain"
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ steps.toolchain.outputs.version }}
+        components: ${{ inputs.components }}

.github/workflows/README.md

@@ -4,14 +4,10 @@ We are attempting to run max 20 parallel jobs using GitHub actions (usage limit
 
 ref: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration
 
-The minimal/recent lock files are handled by CI (`rust.yml`).
-
 ## Jobs
 
-Run from rust.yml unless stated otherwise. Unfortunately we are now exceeding the 20 job target.
-(Prepare is quick and must be run first anyway.)
+Run from rust.yml unless stated otherwise.
 
-0.  `Prepare`
 1.  `Stable - minimal`
 2.  `Stable - recent`
 3.  `Nightly - minimal`
@@ -22,3 +18,4 @@ Run from rust.yml unless stated otherwise. Unfortunately we are now exceeding th
 8.  `Docs`
 9.  `Docsrs`
 10. `Format`
+11. `Integration`

.github/workflows/rust.yml

@@ -9,20 +9,6 @@ on:   # yamllint disable-line rule:truthy
 name: Continuous integration
 
 jobs:
-  Prepare:
-    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
-          echo "rbmt_version=$(cat rbmt-version)" >> $GITHUB_OUTPUT
-
   Stable:                       # 2 jobs, one per lock file.
     name: Test - stable toolchain
     runs-on: ubuntu-latest
@@ -31,32 +17,25 @@ jobs:
       matrix:
         dep: [minimal, recent]
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@stable
-      - name: "Install rbmt"
-        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat rbmt-version) cargo-rbmt
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
+        with:
+          toolchain: stable
       - name: "Run tests"
         run: cargo rbmt test stable --lock-file ${{ matrix.dep }}
 
   Nightly:                      # 2 jobs, one per lock file.
     name: Test - nightly toolchain
-    needs: Prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         dep: [minimal, recent]
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@v1
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
         with:
-          toolchain: ${{ needs.Prepare.outputs.nightly_version }}
-      - name: "Install rbmt"
-        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
+          toolchain: nightly
       - name: "Run tests"
         run: cargo rbmt test nightly --lock-file ${{ matrix.dep }}
 
@@ -68,36 +47,24 @@ jobs:
       matrix:
         dep: [minimal, recent]
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Install stable toolchain"
-        uses: dtolnay/rust-toolchain@stable
-      - name: "Install rbmt"
-        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
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
         with:
           toolchain: "1.74.0"
       - name: "Run tests"
         run: cargo rbmt test msrv --lock-file ${{ matrix.dep }}
 
   Lint:
     name: Lint - nightly toolchain
-    needs: Prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@v1
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
         with:
-          toolchain: ${{ needs.Prepare.outputs.nightly_version }}
-      - name: "Install clippy"
-        run: rustup component add clippy
-      - name: "Install rbmt"
-        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
+          toolchain: nightly
+          components: clippy
       - name: "Run lint"
         run: cargo rbmt lint
 
@@ -107,77 +74,47 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@stable
-      - name: "Install rbmt"
-        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev $(cat rbmt-version) cargo-rbmt
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
+        with:
+          toolchain: stable
       - name: "Build docs"
         run: cargo rbmt docs
 
   Docsrs:
     name: Docs - nightly toolchain
-    needs: Prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@v1
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
         with:
-          toolchain: ${{ needs.Prepare.outputs.nightly_version }}
-      - name: "Install rbmt"
-        run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev ${{ needs.Prepare.outputs.rbmt_version }} cargo-rbmt
+          toolchain: nightly
       - name: "Build docs.rs docs"
         run: cargo rbmt docsrs
 
   Format:                       #  1 job, run cargo fmt directly.
     name: Format - nightly toolchain
-    needs: Prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@v1
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
         with:
-          toolchain: ${{ needs.Prepare.outputs.nightly_version }}
-      - name: "Install rustfmt"
-        run: rustup component add rustfmt
+          toolchain: nightly
+          components: rustfmt
       - name: "Check formatting"
         run: cargo fmt --all -- --check
 
-  Integration:                  # 1 job for each bitcoind version we support.
-    name: Integration tests against bitcoind
+  Integration:                  # 1 job, run bitcoin core integration tests using rbmt.
+    name: Integration - against bitcoind
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        feature:
-          [
-            "29_0",
-            "28_2",
-            "27_2",
-            "26_2",
-            "25_2",
-            "24_2",
-            "23_2",
-            "22_1",
-            "0_21_2",
-            "0_20_2",
-            "0_19_1",
-            "0_18_1",
-            "0_17_2",
-          ]
     steps:
-      - name: "Checkout repo"
-        uses: actions/checkout@v4
-      - name: "Select toolchain"
-        uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/prepare
+        with:
+          toolchain: stable
       - name: "Run integration tests"
-        run: cd bitcoind-tests && cargo test --features=${{ matrix.feature }}
+        run: cargo rbmt integration