From 656c8df6765d730c7f021e5725d2aa694597be1f Mon Sep 17 00:00:00 2001
From: Byron Hambly <bhambly@blockstream.com>
Date: Tue, 27 Dec 2022 19:27:08 +0200
Subject: [PATCH 1/2] build(deps): bump serde to 1.0.52

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe3b6c2c..1b192f36 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3497,9 +3497,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.150"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
@@ -3526,9 +3526,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.150"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",

From 743cf4a4d580fde6f7bfe92d4fceb64e4412368b Mon Sep 17 00:00:00 2001
From: Byron Hambly <bhambly@blockstream.com>
Date: Tue, 27 Dec 2022 19:27:59 +0200
Subject: [PATCH 2/2] ci: migrate to dtolnay/rust-toolchain

---
 .github/workflows/build-release-binaries.yml |  7 ++-----
 .github/workflows/ci.yml                     | 22 +++++++-------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-release-binaries.yml b/.github/workflows/build-release-binaries.yml
index 9e303e5d..48b8b4fa 100644
--- a/.github/workflows/build-release-binaries.yml
+++ b/.github/workflows/build-release-binaries.yml
@@ -52,12 +52,9 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2.2.0
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          profile: minimal
-          target: armv7-unknown-linux-gnueabihf
-          override: true
+          targets: armv7-unknown-linux-gnueabihf
 
       - name: Build ${{ matrix.target }} ${{ matrix.bin }} release binary
         uses: actions-rs/cargo@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e470729..3f007e82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,27 +75,21 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2.2.0
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          profile: minimal
-          target: armv7-unknown-linux-gnueabihf
-          override: true
+          targets: armv7-unknown-linux-gnueabihf
 
       - name: Build binary
         if: matrix.target != 'armv7-unknown-linux-gnueabihf'
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p swap --target ${{ matrix.target }}
+        run: cargo build -p swap --target ${{ matrix.target }}
+
+      - name: Install cross (armv7)
+        if: matrix.target == 'armv7-unknown-linux-gnueabihf'
+        run: cargo install cross --locked
 
       - name: Build binary (armv7)
         if: matrix.target == 'armv7-unknown-linux-gnueabihf'
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p swap --target ${{ matrix.target }}
-          use-cross: true
+        run: cross build -p swap --target ${{ matrix.target }}
 
       - name: Upload swap binary
         uses: actions/upload-artifact@v3