From 5d14a529870156dcc0a1fcba4bafdfae26dd26ed Mon Sep 17 00:00:00 2001 From: Hayden Stainsby Date: Wed, 30 Oct 2024 13:59:25 +0100 Subject: [PATCH] ci: pin Rust to 1.81 for `wasm32-unknown-unknown` tests (#3125) There is an incompatibility with the version of Node available on our test runners and wasm32 in Rust 1.82 (#3123). To unblock the CI, this change pins Rust to 1.81 for the tests using the `wasm32-unknown-unknown` target. This is the same strategy used in Tokio to mitigate tokio-rs/tokio#6910 until a more permanent fix can be put in place. This change also bumps the MSRV on the `tracing-examples` crate from 1.63.0 to 1.64.0 to avoid triggering a lint about the MSRV after a change in Tokio 1.41.0 which bumps the required Rust version for the `try_join!` macro. The Tokio MSRV is 1.70 now, so needing this bump for the examples seems reasonable. --- .github/workflows/CI.yml | 24 +++++++++++++----------- examples/Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fc79d096..dc14a813 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: name: cargo check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - name: Check run: cargo check --all --tests --benches @@ -46,7 +46,7 @@ jobs: needs: check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: components: rustfmt @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest needs: check steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: components: clippy @@ -88,7 +88,7 @@ jobs: - tracing - tracing-subscriber steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - name: install cargo-hack uses: taiki-e/install-action@cargo-hack @@ -146,7 +146,7 @@ jobs: - 1.63.0 - stable steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install Rust nightly uses: dtolnay/rust-toolchain@nightly - name: "install Rust ${{ matrix.toolchain }}" @@ -210,7 +210,7 @@ jobs: fail-fast: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "install Rust ${{ matrix.rust }}" uses: dtolnay/rust-toolchain@master with: @@ -252,7 +252,7 @@ jobs: - tracing-tower fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: target: wasm32-unknown-unknown @@ -268,9 +268,11 @@ jobs: subcrate: - tracing steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - uses: actions/checkout@v4 + - name: Install Rust 1.81 + uses: dtolnay/rust-toolchain@stable with: + toolchain: 1.81 target: wasm32-unknown-unknown - name: install test runner for wasm uses: taiki-e/install-action@wasm-pack @@ -283,7 +285,7 @@ jobs: needs: check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - name: "Test log support" run: cargo test @@ -315,4 +317,4 @@ jobs: - test-wasm - test-features-stable steps: - - run: exit 0 \ No newline at end of file + - run: exit 0 diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 9c07e334..14436445 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -3,7 +3,7 @@ name = "tracing-examples" version = "0.0.0" publish = false edition = "2018" -rust-version = "1.63.0" +rust-version = "1.64.0" [features] default = []