Skip to content

Commit f45bba5

Browse files
committed
update ci toolchain
1 parent 51eaefe commit f45bba5

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ jobs:
3030
include:
3131
- build: ubuntu
3232
os: ubuntu-latest
33-
rust: nightly-2022-11-17
33+
rust: nightly-2023-03-02
3434
host_target: x86_64-unknown-linux-gnu
3535
mustang_target: x86_64-mustang-linux-gnu
3636
- build: ubuntu-18.04
3737
os: ubuntu-18.04
38-
rust: nightly-2022-11-17
38+
rust: nightly-2023-03-02
3939
host_target: x86_64-unknown-linux-gnu
4040
mustang_target: x86_64-mustang-linux-gnu
4141
- build: i686-linux
4242
os: ubuntu-latest
43-
rust: nightly-2022-11-17
43+
rust: nightly-2023-03-02
4444
target: i686-unknown-linux-gnu
4545
gcc_package: gcc-i686-linux-gnu
4646
gcc: i686-linux-gnu-gcc
@@ -49,7 +49,7 @@ jobs:
4949
mustang_target: i686-mustang-linux-gnu
5050
- build: aarch64-linux
5151
os: ubuntu-latest
52-
rust: nightly-2022-11-17
52+
rust: nightly-2023-03-02
5353
target: aarch64-unknown-linux-gnu
5454
gcc_package: gcc-aarch64-linux-gnu
5555
gcc: aarch64-linux-gnu-gcc
@@ -59,7 +59,7 @@ jobs:
5959
mustang_target: aarch64-mustang-linux-gnu
6060
- build: riscv64-linux
6161
os: ubuntu-latest
62-
rust: nightly-2022-11-17
62+
rust: nightly-2023-03-02
6363
target: riscv64gc-unknown-linux-gnu
6464
gcc_package: gcc-riscv64-linux-gnu
6565
gcc: riscv64-linux-gnu-gcc
@@ -140,28 +140,28 @@ jobs:
140140

141141
- name: Install rust-src
142142
run: |
143-
rustup component add rust-src --toolchain nightly-2022-11-17-x86_64-unknown-linux-gnu
143+
rustup component add rust-src --toolchain nightly-2023-03-02-x86_64-unknown-linux-gnu
144144
145145
- name: cargo check non-mustang
146146
run: |
147147
# Check that the code compiles on non-mustang targets.
148-
cargo +nightly-2022-11-17 check --all --target=${{ matrix.host_target }}
148+
cargo +nightly-2023-03-02 check --all --target=${{ matrix.host_target }}
149149
150150
- name: cargo test
151151
run: |
152-
cargo +nightly-2022-11-17 test --verbose -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json -- ${{ matrix.test_args }} -- --nocapture
152+
cargo +nightly-2023-03-02 test --verbose -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json -- ${{ matrix.test_args }} -- --nocapture
153153
env:
154154
RUST_BACKTRACE: 1
155155

156156
- name: cargo test --release
157157
run: |
158-
cargo +nightly-2022-11-17 test --verbose --release -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json -- ${{ matrix.test_args }}
158+
cargo +nightly-2023-03-02 test --verbose --release -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json -- ${{ matrix.test_args }}
159159
env:
160160
RUST_BACKTRACE: 1
161161

162162
- name: test mustang_use_libc
163163
run: |
164-
RUSTFLAGS=--cfg=mustang_use_libc cargo +nightly-2022-11-17 check --workspace -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json
164+
RUSTFLAGS=--cfg=mustang_use_libc cargo +nightly-2023-03-02 check --workspace -Z build-std --target=mustang/target-specs/${{ matrix.mustang_target }}.json
165165
env:
166166
RUST_BACKTRACE: 1
167167

@@ -182,27 +182,27 @@ jobs:
182182
- name: test libc-replacement in non-mustang mode
183183
working-directory: test-crates/libc-replacement
184184
run: |
185-
cargo +nightly-2022-11-17 run --target=${{ matrix.host_target }}
185+
cargo +nightly-2023-03-02 run --target=${{ matrix.host_target }}
186186
env:
187187
RUST_BACKTRACE: 1
188188

189189
- name: test origin-as-just-a-library in non-mustang mode
190190
working-directory: test-crates/origin-as-just-a-library
191191
run: |
192-
cargo +nightly-2022-11-17 run --target=${{ matrix.host_target }}
192+
cargo +nightly-2023-03-02 run --target=${{ matrix.host_target }}
193193
env:
194194
RUST_BACKTRACE: 1
195195

196196
- name: test mustang-nostd as program
197197
working-directory: test-crates/mustang-nostd
198198
run: |
199-
cargo +nightly-2022-11-17 run -Zbuild-std=core,alloc --target=../../mustang/target-specs/${{ matrix.mustang_target }}.json
199+
cargo +nightly-2023-03-02 run -Zbuild-std=core,alloc --target=../../mustang/target-specs/${{ matrix.mustang_target }}.json
200200
env:
201201
RUST_BACKTRACE: 1
202202

203203
- name: test mustang-nostd as tests
204204
working-directory: test-crates/mustang-nostd
205205
run: |
206-
cargo +nightly-2022-11-17 test -Zbuild-std=core,alloc,test,std --target=../../mustang/target-specs/${{ matrix.mustang_target }}.json
206+
cargo +nightly-2023-03-02 test -Zbuild-std=core,alloc,test,std --target=../../mustang/target-specs/${{ matrix.mustang_target }}.json
207207
env:
208208
RUST_BACKTRACE: 1

test-crates/mustang-nostd/src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#![feature(lang_items)]
2-
// TODO: Remove when updating toolchain for tests
3-
#![feature(default_alloc_error_handler)]
42
#![no_std]
53
// When testing we do not want to use our main function
64
#![cfg_attr(not(test), no_main)]

0 commit comments

Comments
 (0)