Skip to content

Commit d5e919e

Browse files
authored
Update main.yml
1 parent 4d75357 commit d5e919e

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

.github/workflows/main.yml

+8-15
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,36 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19+
toolchain: ['stable', 'nightly']
1920
include:
2021
- { target: aarch64-apple-darwin, os: macos-14 }
2122
- { target: x86_64-apple-darwin, os: macos-13 }
2223
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
2324
- { target: aarch64-unknown-linux-gnu, os: ubuntu-latest }
2425
- { target: x86_64-pc-windows-msvc, os: windows-latest }
25-
runs-on: ${{ matrix.platform.os }}
26+
runs-on: ${{ matrix.os }}
2627
env:
2728
HARFBUZZ_SYS_NO_PKG_CONFIG: true
2829
steps:
2930
- uses: actions/checkout@v4
30-
- uses: actions-rs/toolchain@v1
31+
- uses: dtolnay/rust-toolchain@v1
3132
with:
32-
toolchain: stable
33-
override: true
34-
profile: minimal
35-
33+
toolchain: ${{ matrix.toolchain }}
34+
target: ${{ matrix.target }}
3635
- name: Install packages
36+
if: ${{ matrix.os == 'ubuntu-latest' }}
3737
run: |
3838
sudo apt-get update
3939
sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake
4040
4141
- name: Install rustc target
4242
run: rustup target add aarch64-unknown-linux-gnu
43-
44-
- name: Build arm64 simd
45-
run: cargo build --target aarch64-unknown-linux-gnu
46-
working-directory: simd
47-
48-
- name: Build arm64 geometry
49-
run: cargo build --target aarch64-unknown-linux-gnu
50-
working-directory: geometry
5143

5244
- name: Build
53-
run: cargo build
45+
run: cargo build --target ${{ matrix.target }}
5446

5547
- name: Test
48+
if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
5649
run: cargo test
5750

5851
build_result:

0 commit comments

Comments
 (0)