Skip to content

Commit ecbe6c3

Browse files
committed
Update toolchain
1 parent 0dcf0a4 commit ecbe6c3

File tree

2 files changed

+29
-45
lines changed

2 files changed

+29
-45
lines changed

.github/workflows/rust.yml

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
on: [push, pull_request, workflow_dispatch]
2-
32
name: CI
4-
53
env:
64
RUSTFLAGS: -D warnings
75
RUSTDOCFLAGS: -D warnings
8-
96
jobs:
107
check:
118
name: Check
@@ -21,7 +18,6 @@ jobs:
2118
with:
2219
command: check
2320
args: --all-features
24-
2521
check_wasm:
2622
name: Check wasm32
2723
runs-on: ubuntu-latest
@@ -37,7 +33,6 @@ jobs:
3733
with:
3834
command: check
3935
args: --all-features --lib --target wasm32-unknown-unknown
40-
4136
test:
4237
name: Test Suite
4338
runs-on: ubuntu-latest
@@ -53,7 +48,6 @@ jobs:
5348
with:
5449
command: test
5550
args: --lib
56-
5751
fmt:
5852
name: Rustfmt
5953
runs-on: ubuntu-latest
@@ -69,7 +63,6 @@ jobs:
6963
with:
7064
command: fmt
7165
args: --all -- --check
72-
7366
clippy:
7467
name: Clippy
7568
runs-on: ubuntu-latest
@@ -85,7 +78,6 @@ jobs:
8578
with:
8679
command: clippy
8780
args: -- -D warnings
88-
8981
trunk:
9082
name: trunk
9183
runs-on: ubuntu-latest
@@ -94,52 +86,43 @@ jobs:
9486
- uses: actions-rs/toolchain@v1
9587
with:
9688
profile: minimal
97-
toolchain: 1.85.0
89+
toolchain: 1.89.0
9890
target: wasm32-unknown-unknown
9991
override: true
10092
- name: Download and install Trunk binary
10193
run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
10294
- name: Build
10395
run: ./trunk build
104-
10596
build:
10697
runs-on: ${{ matrix.os }}
10798
strategy:
10899
fail-fast: false
109100
matrix:
110101
include:
111-
- os: macos-latest
112-
TARGET: aarch64-apple-darwin
113-
114-
- os: macos-latest
115-
TARGET: x86_64-apple-darwin
116-
117-
- os: ubuntu-latest
118-
TARGET: arm-unknown-linux-musleabihf
119-
120-
- os: ubuntu-latest
121-
TARGET: armv7-unknown-linux-musleabihf
122-
123-
- os: ubuntu-latest
124-
TARGET: x86_64-unknown-linux-musl
125-
126-
- os: windows-latest
127-
TARGET: x86_64-pc-windows-msvc
128-
EXTENSION: .exe
129-
102+
- os: macos-latest
103+
TARGET: aarch64-apple-darwin
104+
- os: macos-latest
105+
TARGET: x86_64-apple-darwin
106+
- os: ubuntu-latest
107+
TARGET: arm-unknown-linux-musleabihf
108+
- os: ubuntu-latest
109+
TARGET: armv7-unknown-linux-musleabihf
110+
- os: ubuntu-latest
111+
TARGET: x86_64-unknown-linux-musl
112+
- os: windows-latest
113+
TARGET: x86_64-pc-windows-msvc
114+
EXTENSION: .exe
130115
steps:
131-
- name: Building ${{ matrix.TARGET }}
132-
run: echo "${{ matrix.TARGET }}"
133-
134-
- uses: actions/checkout@master
135-
- uses: actions-rs/toolchain@v1.0.1
136-
with:
137-
toolchain: stable
138-
target: ${{ matrix.TARGET }}
139-
override: true
140-
141-
- uses: actions-rs/cargo@v1
142-
with:
143-
use-cross: true
144-
command: build
145-
args: --verbose --release --target=${{ matrix.TARGET }}
116+
- name: Building ${{ matrix.TARGET }}
117+
run: echo "${{ matrix.TARGET }}"
118+
- uses: actions/checkout@master
119+
- uses: actions-rs/toolchain@v1.0.1
120+
with:
121+
toolchain: stable
122+
target: ${{ matrix.TARGET }}
123+
override: true
124+
- uses: actions-rs/cargo@v1
125+
with:
126+
use-cross: true
127+
command: build
128+
args: --verbose --release --target=${{ matrix.TARGET }}

check.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ cargo fmt --all -- --check
88
cargo clippy --quiet --workspace --all-targets --all-features -- -D warnings -W clippy::all
99
cargo test --quiet --workspace --all-targets --all-features
1010
cargo test --quiet --workspace --doc
11-
trunk build
11+
12+
env -u NO_COLOR trunk build

0 commit comments

Comments
 (0)