Skip to content

Commit 2aa3b4b

Browse files
authored
Update main.yml
1 parent 9b1facd commit 2aa3b4b

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

.github/workflows/main.yml

+18-11
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,18 @@ jobs:
1818
matrix:
1919
toolchain: [stable, nightly]
2020
platform:
21-
- { target: aarch64-apple-darwin, os: macos-14 }
22-
- { target: x86_64-apple-darwin, os: macos-13 }
23-
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
24-
- { target: aarch64-unknown-linux-gnu, os: ubuntu-latest }
25-
- { target: x86_64-pc-windows-msvc, os: windows-latest }
21+
# native targets
22+
- { target: aarch64-apple-darwin, os: macos-14, native: true }
23+
- { target: x86_64-apple-darwin, os: macos-13, native: true }
24+
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, native: true }
25+
- { target: x86_64-pc-windows-msvc, os: windows-latest, native: true }
26+
# arm64 linux
27+
- { target: aarch64-unknown-linux-gnu, os: ubuntu-latest, native: false }
28+
# all servo's android targets
29+
- { target: aarch64-linux-android, os: ubuntu-latest, native: false }
30+
- { target: armv7-linux-androideabi, os: ubuntu-latest, native: false }
31+
- { target: i686-linux-android, os: ubuntu-latest, native: false }
32+
- { target: x86_64-linux-android, os: ubuntu-latest, native: false }
2633
runs-on: ${{ matrix.platform.os }}
2734
env:
2835
HARFBUZZ_SYS_NO_PKG_CONFIG: true
@@ -38,22 +45,22 @@ jobs:
3845
sudo apt-get update
3946
sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake
4047
41-
- name: Build arm64 simd
42-
if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }}
48+
- name: Build simd
49+
if: ${{ !matrix.platform.native }}
4350
run: cargo build --target ${{ matrix.platform.target }}
4451
working-directory: simd
4552

46-
- name: Build arm64 geometry
47-
if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }}
53+
- name: Build geometry
54+
if: ${{ !matrix.platform.native }}
4855
run: cargo build --target ${{ matrix.platform.target }}
4956
working-directory: geometry
5057

5158
- name: Build
52-
if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }}
59+
if: ${{ matrix.platform.native }}
5360
run: cargo build --target ${{ matrix.platform.target }}
5461

5562
- name: Test
56-
if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }}
63+
if: ${{ matrix.platform.native }}
5764
run: cargo test
5865

5966
build_result:

0 commit comments

Comments
 (0)