From babd1633df67f421502b3b2036134db361172def Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Fri, 9 Jan 2026 10:09:13 -0500
Subject: [PATCH 1/2] ci: bump macos runner to macos-15

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa5291435..e9c302a71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-13-large]
+        os: [ubuntu-24.04, macos-15]
       fail-fast: false
     steps:
       - name: Install Rust toolchain
@@ -52,7 +52,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-13-large]
+        os: [ubuntu-24.04, macos-15]
       fail-fast: false
     steps:
       - name: Install Rust toolchain
@@ -93,7 +93,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-13-large]
+        os: [ubuntu-24.04, macos-15]
       fail-fast: false
     steps:
       - name: Install Rust toolchain

From 5efdbc9cb6952e93c7d9487737714d0f5d98fe88 Mon Sep 17 00:00:00 2001
From: Linwei Shang <linwei.shang@dfinity.org>
Date: Fri, 9 Jan 2026 10:36:21 -0500
Subject: [PATCH 2/2] try fix rust installation

---
 .github/workflows/ci.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9c302a71..200f93b33 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,10 +22,10 @@ jobs:
       fail-fast: false
     steps:
       - name: Install Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: 1.85.0 # MSRV, should sync with `rust-toolchain` in `Cargo.toml`
-          target: wasm32-unknown-unknown
+          targets: wasm32-unknown-unknown
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Cache
@@ -55,8 +55,6 @@ jobs:
         os: [ubuntu-24.04, macos-15]
       fail-fast: false
     steps:
-      - name: Install Rust toolchain
-        run: rustup show active-toolchain || rustup toolchain install
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Cache
@@ -100,6 +98,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-2025-05-09 # 1.88.0
+          targets: wasm64-unknown-unknown
           components: rust-src
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -133,8 +132,6 @@ jobs:
     name: cargo fmt
     runs-on: ubuntu-24.04
     steps:
-      - name: Install Rust toolchain
-        run: rustup show active-toolchain || rustup toolchain install
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Cache
@@ -158,8 +155,6 @@ jobs:
     name: cargo clippy
     runs-on: ubuntu-24.04
     steps:
-      - name: Install Rust toolchain
-        run: rustup show active-toolchain || rustup toolchain install
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Cache
@@ -193,8 +188,6 @@ jobs:
     name: cargo doc
     runs-on: ubuntu-24.04
     steps:
-      - name: Install Rust toolchain
-        run: rustup show active-toolchain || rustup toolchain install
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Cache