Skip to content

Commit 4cdc981

Browse files
authored
Merge pull request #781 from uuid-rs/ci/rust-versions
Update rust toolchain before building
2 parents 5cbe0ce + 1ce698c commit 4cdc981

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

.cargo/config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[target.wasm32-wasi]
1+
[target.wasm32-wasip1]
22
runner = "wasmtime"

.github/workflows/ci.yml

+24-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
5151

5252
- name: Install Rust Toolchain
53-
run: rustup default ${{ matrix.channel }}-${{ matrix.rust_target }}
53+
run: rustup update ${{ matrix.channel }}-${{ matrix.rust_target }} && rustup default ${{ matrix.channel }}-${{ matrix.rust_target }}
5454

5555
- name: Install cargo-hack
5656
run: cargo install cargo-hack
@@ -74,6 +74,9 @@ jobs:
7474
- name: Checkout sources
7575
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
7676

77+
- name: Install Rust Toolchain
78+
run: rustup update stable
79+
7780
- name: All features
7881
run: cargo test --all-features
7982

@@ -97,6 +100,9 @@ jobs:
97100
- name: Checkout sources
98101
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
99102

103+
- name: Install Rust Toolchain
104+
run: rustup update stable
105+
100106
- name: Examples
101107
run: cargo test --manifest-path examples/Cargo.toml
102108

@@ -112,6 +118,9 @@ jobs:
112118
with:
113119
node-version: '20'
114120

121+
- name: Install Rust Toolchain
122+
run: rustup update stable
123+
115124
- name: Install
116125
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
117126

@@ -137,17 +146,20 @@ jobs:
137146
- name: Add Wasmtime to path
138147
run: echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
139148

140-
- name: Install wasm32-wasi target
141-
run: rustup target add wasm32-wasi
149+
- name: Install Rust Toolchain
150+
run: rustup update nightly && rustup default nightly
151+
152+
- name: Install wasm32-wasip1 target
153+
run: rustup target add wasm32-wasip1
142154

143155
- name: Default features
144-
run: cargo test --target wasm32-wasi
156+
run: cargo test --target wasm32-wasip1
145157

146158
- name: Version features
147-
run: cargo test --target wasm32-wasi --features "$VERSION_FEATURES $DEP_FEATURES"
159+
run: cargo test --target wasm32-wasip1 --features "$VERSION_FEATURES $DEP_FEATURES"
148160

149161
- name: Fast RNG
150-
run: cargo test --target wasm32-wasi --features "v4 fast-rng"
162+
run: cargo test --target wasm32-wasip1 --features "v4 fast-rng"
151163

152164
miri:
153165
name: Tests / Miri
@@ -156,6 +168,9 @@ jobs:
156168
- name: Checkout sources
157169
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
158170

171+
- name: Install Rust Toolchain
172+
run: rustup update nightly
173+
159174
- name: Install Miri
160175
run: |
161176
rustup toolchain install nightly --component miri
@@ -174,6 +189,9 @@ jobs:
174189
- name: Checkout sources
175190
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
176191

192+
- name: Install Rust Toolchain
193+
run: rustup update beta
194+
177195
- name: Install Clippy
178196
run: |
179197
rustup update beta

0 commit comments

Comments
 (0)