Skip to content

Commit 53fc0dc

Browse files
committed
feat: refine build job naming and update macOS test conditions for better clarity
1 parent 1b006b1 commit 53fc0dc

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
needs: download-models
105105
runs-on: ${{ matrix.os }}
106106
container: ${{ matrix.container && matrix.container || '' }}
107-
name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}}
107+
name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ' + test' || ''}}
108108
timeout-minutes: 120
109109
env:
110110
# SANITIZE=0 disables -fsanitize=address,undefined for the test_adam
@@ -531,7 +531,11 @@ jobs:
531531
VULKAN_SDK: "C:/msys64/mingw64"
532532

533533
- name: unix test adam extension
534-
if: contains(matrix.name, 'linux') || ( matrix.name == 'macos' && matrix.arch != 'x86_64' )
534+
if: contains(matrix.name, 'linux') || matrix.name == 'macos'
535+
# The macos-15 runner is arm64; the macos x86_64 matrix entry produces
536+
# a pure x86_64 binary and runs it via Rosetta 2 (preinstalled on the
537+
# runner image).
538+
#
535539
# SANITIZE=0 is the job-level default — pass it explicitly into the
536540
# linux-musl arm64 docker container (libasan/ubsan aren't in Alpine).
537541
run: ${{ contains(matrix.name, 'linux-musl') && matrix.arch == 'arm64' && 'docker exec -e SANITIZE alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}}

0 commit comments

Comments
 (0)