From 9c880b082b38187e670965b6f30872edf864ac80 Mon Sep 17 00:00:00 2001 From: fly1d Date: Thu, 27 Aug 2026 17:14:39 +0800 Subject: [PATCH 1/8] ci: skip workspace semver on release pushes (#8390) `github.event.pull_request.base.ref` is empty for push events, so the workspace semver check runs on `tokio-1.*.x` branches. Also check `github.ref_name` to preserve the intended release-branch exclusion while leaving pull request behavior unchanged. Fixes: #8389 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edaf63722..a4ba1ca86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -515,7 +515,7 @@ jobs: package: tokio release-type: minor - name: Check semver for rest of the workspace - if: ${{ !startsWith(github.event.pull_request.base.ref, 'tokio-1.') }} + if: ${{ !startsWith(github.event.pull_request.base.ref, 'tokio-1.') && !startsWith(github.ref_name, 'tokio-1.') }} uses: obi1kenobi/cargo-semver-checks-action@v2 with: rust-toolchain: ${{ env.rust_stable }} From 705989c98b8d033f0c1b23ecc571d74bc807baaf Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Wed, 22 Jul 2026 23:57:22 -0600 Subject: [PATCH 2/8] ci: pin Wasmtime version(s) in CI (#8314) Per https://github.com/bytecodealliance/wasmtime/pull/13558, Wasmtime v46.0.1 was the last release to support `wasm32-wasip1-threads`, so we use that for the WASIp1 testing. For WASIp2, we should be able to use any recent version of Wasmtime, but we pin to a specific version anyway to avoid surprises. (cherry picked from commit 5760ccdc37a16ad8a75bab742c4525857f747f1c) --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4ba1ca86..4ecfcec01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1071,7 +1071,10 @@ jobs: - name: Install cargo-hack, wasmtime uses: taiki-e/install-action@v2 with: - tool: cargo-hack,wasmtime + # Wasmtime v46.0.1 is the last version to support + # `wasm32-wasip1-threads` (which was an experiment that was never + # standardized): + tool: cargo-hack,wasmtime@46.0.1 - uses: Swatinem/rust-cache@v2 - name: WASI test tokio full From 16a6a2390caa5e6cdc149772580f04a887c38a4f Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Thu, 3 Sep 2026 13:55:05 +0000 Subject: [PATCH 3/8] ci: pin cargo-fuzz to 0.13.1 for check-fuzzing (#8403) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ecfcec01..94f64d5a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1155,7 +1155,7 @@ jobs: toolchain: ${{ env.rust_nightly }} - uses: Swatinem/rust-cache@v2 - name: Install cargo-fuzz - run: cargo install cargo-fuzz + run: cargo install --locked cargo-fuzz --version 0.13.1 - name: Check /tokio/ run: cargo fuzz check --all-features working-directory: tokio From 66f836e61ae201d62a0a816316cac3ad29ba21f0 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Thu, 3 Sep 2026 14:31:54 +0000 Subject: [PATCH 4/8] tests: mark failing taskdump tests as #[ignore] (#8403) --- tokio/tests/dump.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tokio/tests/dump.rs b/tokio/tests/dump.rs index c946f3843..d16d8a763 100644 --- a/tokio/tests/dump.rs +++ b/tokio/tests/dump.rs @@ -26,6 +26,7 @@ async fn c() { } #[test] +#[ignore] fn current_thread() { let rt = runtime::Builder::new_current_thread() .enable_all() @@ -63,6 +64,7 @@ fn current_thread() { } #[test] +#[ignore] fn multi_thread() { let rt = runtime::Builder::new_multi_thread() .enable_all() From 3e6eb7d33aa24e1904a5900e3fa8e5f35f90efe1 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 5 Sep 2026 10:27:15 +0000 Subject: [PATCH 5/8] ci: use Rust 1.98 for wasm32-wasip2 (#8412) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8883687e..464ee4532 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1126,10 +1126,10 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - name: Install Rust ${{ env.rust_stable }} + - name: Install Rust 1.98 uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.rust_stable }} + toolchain: '1.98' targets: wasm32-wasip2 - name: Install cargo-nextest, wasmtime From b62fa166aa65e9785c236d6da3e7af13cc10692d Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 7 Sep 2026 07:28:19 +0000 Subject: [PATCH 6/8] Revert "ci: use Rust 1.98 for wasm32-wasip2 (#8412)" (#8425) This reverts commit 3e6eb7d33aa24e1904a5900e3fa8e5f35f90efe1. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 464ee4532..e8883687e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1126,10 +1126,10 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - name: Install Rust 1.98 + - name: Install Rust ${{ env.rust_stable }} uses: dtolnay/rust-toolchain@stable with: - toolchain: '1.98' + toolchain: ${{ env.rust_stable }} targets: wasm32-wasip2 - name: Install cargo-nextest, wasmtime From e456a12f89ad2e08c8d4f8be784af23a5378c0b6 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 7 Sep 2026 07:28:24 +0000 Subject: [PATCH 7/8] Revert "tests: mark failing taskdump tests as #[ignore] (#8403)" (#8425) This reverts commit 66f836e61ae201d62a0a816316cac3ad29ba21f0. --- tokio/tests/dump.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tokio/tests/dump.rs b/tokio/tests/dump.rs index 003b45eba..56aab8f2b 100644 --- a/tokio/tests/dump.rs +++ b/tokio/tests/dump.rs @@ -26,7 +26,6 @@ async fn c() { } #[test] -#[ignore] fn current_thread() { let rt = runtime::Builder::new_current_thread() .enable_all() @@ -64,7 +63,6 @@ fn current_thread() { } #[test] -#[ignore] fn multi_thread() { let rt = runtime::Builder::new_multi_thread() .enable_all() From e4be0cfe2424d827e840954720e378826c27ff37 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 7 Sep 2026 07:28:30 +0000 Subject: [PATCH 8/8] Revert "ci: pin cargo-fuzz to 0.13.1 for check-fuzzing (#8403)" (#8425) This reverts commit 16a6a239b03a74340d859ebc5740449492163b2f. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8883687e..8b2bea4e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1191,7 +1191,7 @@ jobs: toolchain: ${{ env.rust_nightly }} - uses: Swatinem/rust-cache@v2 - name: Install cargo-fuzz - run: cargo install --locked cargo-fuzz --version 0.13.1 + run: cargo install cargo-fuzz - name: Check /tokio/ run: cargo fuzz check --all-features working-directory: tokio