Skip to content

Commit 00809ea

Browse files
committed
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.
1 parent 70a8678 commit 00809ea

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/CI.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
name: cargo check
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939
- uses: dtolnay/rust-toolchain@stable
4040
- name: Check
4141
run: cargo check --all --tests --benches
@@ -46,7 +46,7 @@ jobs:
4646
needs: check
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050
- uses: dtolnay/rust-toolchain@stable
5151
with:
5252
components: rustfmt
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
needs: check
6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
- uses: dtolnay/rust-toolchain@stable
6363
with:
6464
components: clippy
@@ -88,7 +88,7 @@ jobs:
8888
- tracing
8989
- tracing-subscriber
9090
steps:
91-
- uses: actions/checkout@v3
91+
- uses: actions/checkout@v4
9292
- uses: dtolnay/rust-toolchain@stable
9393
- name: install cargo-hack
9494
uses: taiki-e/install-action@cargo-hack
@@ -146,7 +146,7 @@ jobs:
146146
- 1.63.0
147147
- stable
148148
steps:
149-
- uses: actions/checkout@v3
149+
- uses: actions/checkout@v4
150150
- name: install Rust nightly
151151
uses: dtolnay/rust-toolchain@nightly
152152
- name: "install Rust ${{ matrix.toolchain }}"
@@ -210,7 +210,7 @@ jobs:
210210
fail-fast: false
211211
runs-on: ${{ matrix.os }}
212212
steps:
213-
- uses: actions/checkout@v3
213+
- uses: actions/checkout@v4
214214
- name: "install Rust ${{ matrix.rust }}"
215215
uses: dtolnay/rust-toolchain@master
216216
with:
@@ -252,7 +252,7 @@ jobs:
252252
- tracing-tower
253253
fail-fast: false
254254
steps:
255-
- uses: actions/checkout@v3
255+
- uses: actions/checkout@v4
256256
- uses: dtolnay/rust-toolchain@stable
257257
with:
258258
target: wasm32-unknown-unknown
@@ -268,9 +268,11 @@ jobs:
268268
subcrate:
269269
- tracing
270270
steps:
271-
- uses: actions/checkout@v3
272-
- uses: dtolnay/rust-toolchain@stable
271+
- uses: actions/checkout@v4
272+
- name: Install Rust 1.81
273+
uses: dtolnay/rust-toolchain@stable
273274
with:
275+
toolchain: 1.81
274276
target: wasm32-unknown-unknown
275277
- name: install test runner for wasm
276278
uses: taiki-e/install-action@wasm-pack
@@ -283,7 +285,7 @@ jobs:
283285
needs: check
284286
runs-on: ubuntu-latest
285287
steps:
286-
- uses: actions/checkout@v3
288+
- uses: actions/checkout@v4
287289
- uses: dtolnay/rust-toolchain@stable
288290
- name: "Test log support"
289291
run: cargo test
@@ -315,4 +317,4 @@ jobs:
315317
- test-wasm
316318
- test-features-stable
317319
steps:
318-
- run: exit 0
320+
- run: exit 0

examples/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "tracing-examples"
33
version = "0.0.0"
44
publish = false
55
edition = "2018"
6-
rust-version = "1.63.0"
6+
rust-version = "1.64.0"
77

88
[features]
99
default = []

0 commit comments

Comments
 (0)