From f783c1db5d6cd7ab8f7601a933d9a275881a839e Mon Sep 17 00:00:00 2001
From: Nick Johnson <nick@yonson.dev>
Date: Thu, 12 Feb 2026 15:09:42 -0800
Subject: [PATCH] Consolidate CI

Bump rbmt version and use explicit toolchains.
---
 .github/workflows/README.md | 21 ---------------------
 .github/workflows/rust.yml  | 16 +++++++++++-----
 rbmt-version                |  2 +-
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/README.md

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
deleted file mode 100644
index d9e973b..0000000
--- a/.github/workflows/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# rust-psbt workflow notes
-
-We are attempting to run max 20 parallel jobs using GitHub actions (usage limit for free tier).
-
-ref: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration
-
-## Jobs
-
-Run from rust.yml unless stated otherwise.
-
-1.  `Stable - minimal`
-2.  `Stable - recent`
-3.  `Nightly - minimal`
-4.  `Nightly - recent`
-5.  `MSRV - minimal`
-6.  `MSRV - recent`
-7.  `Lint`
-8.  `Docs`
-9.  `Docsrs`
-10. `Format`
-11. `Integration`
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e630c99..700ae6f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,12 +1,16 @@
----   # rust-psbt CI: If you edit this file please update README.md
+---
+# rust-psbt CI
+#
+# CI job and task structure is optimized for developer debugging. Not runner
+# minutes or parallelism.
+
 on:   # yamllint disable-line rule:truthy
   push:
     branches:
       - master
-      - 'test-ci/**'
   pull_request:
 
-name: Continuous integration
+name: Continuous Integration
 
 jobs:
   Stable:                       # 2 jobs, one per lock file.
@@ -19,8 +23,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
+        id: setup
       - name: "Run tests"
-        run: cargo rbmt test stable --lock-file ${{ matrix.dep }}
+        run: cargo +${{ steps.setup.outputs.stable-version }} rbmt test stable --lock-file ${{ matrix.dep }}
 
   Nightly:                      # 2 jobs, one per lock file.
     name: Test - nightly toolchain
@@ -71,8 +76,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: rust-bitcoin/rust-bitcoin-maintainer-tools/.github/actions/setup-rbmt@master
+        id: setup
       - name: "Build docs"
-        run: cargo rbmt docs
+        run: cargo +${{ steps.setup.outputs.stable-version }} rbmt docs
 
   Docsrs:
     name: Docs - nightly toolchain
diff --git a/rbmt-version b/rbmt-version
index ab2c098..4f7b79a 100644
--- a/rbmt-version
+++ b/rbmt-version
@@ -1 +1 @@
-16de1f1e65bf49e5451f1f491255bd898441c6ab
+257e19f400ab1bfa51c2051b5551d92f75b5f738