Skip to content

Commit 93c83c6

Browse files
committed
Add os matrix to test best arm simulator
1 parent 47ebee4 commit 93c83c6

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
arch: [x86, x86_64, armv7, aarch64]
2828
cpu_instr: [non-SIMD, SSE2, auto-selected]
29+
os: [ubuntu, alpine]
2930

3031
steps:
3132
- uses: actions/checkout@v3
@@ -85,18 +86,18 @@ jobs:
8586
shell-name: alpine-armv7.sh
8687

8788
- name: Build trimal for Linux armv7 (alpine)
88-
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD'
89+
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD' && matrix.os == 'alpine'
8990
run: cmake . -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
9091
./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
9192
shell: alpine-armv7.sh {0}
9293
- name: Build trimal for Linux armv7 (alpine) and auto-selected SIMD (NEON)
93-
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected'
94+
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected' && matrix.os == 'alpine'
9495
run: cmake . && make && file bin/trimal && file bin/readal &&
9596
./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
9697
shell: alpine-armv7.sh {0}
9798

9899
- name: Build trimal for Linux armv7 (ubuntu)
99-
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD'
100+
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD' && matrix.os == 'ubuntu'
100101
uses: uraimo/run-on-arch-action@v2
101102
# Emulate ARM architecture since it's not natively supported by GitHub.
102103
# Warning about image and host platforms not matching may be ignored (https://github.com/uraimo/run-on-arch-action/issues/127#issuecomment-1605691328)
@@ -114,7 +115,7 @@ jobs:
114115
./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
115116
116117
- name: Build trimal for Linux armv7 (ubuntu) and auto-selected SIMD (NEON)
117-
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected'
118+
if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected' && matrix.os == 'ubuntu'
118119
uses: uraimo/run-on-arch-action@v2
119120
# Emulate ARM architecture since it's not natively supported by GitHub.
120121
# Warning about image and host platforms not matching may be ignored (https://github.com/uraimo/run-on-arch-action/issues/127#issuecomment-1605691328)

0 commit comments

Comments
 (0)