@@ -304,7 +304,7 @@ jobs:
304304
305305 linux-build :
306306 name : Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
307- runs-on : ${{ matrix.runner }}
307+ runs-on : ${{ fromJson('{ "x86_64": "ubuntu-24.04", "aarch64": "ubuntu-24.04-arm" }')[ matrix.arch] }}
308308 strategy :
309309 fail-fast : false
310310 matrix :
@@ -316,11 +316,6 @@ jobs:
316316 - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }}
317317 - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }}
318318 - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_host_archs) || '[]') }}
319- include :
320- - arch : x86_64
321- runner : ubuntu-24.04
322- - arch : aarch64
323- runner : ubuntu-24.04-arm
324319 container :
325320 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
326321 steps :
@@ -378,7 +373,7 @@ jobs:
378373
379374 linux-static-sdk-build :
380375 name : Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
381- runs-on : ${{ matrix.runner }}
376+ runs-on : ${{ fromJson('{ "x86_64": "ubuntu-24.04", "aarch64": "ubuntu-24.04-arm" }')[ matrix.arch] }}
382377 strategy :
383378 fail-fast : false
384379 matrix :
@@ -390,11 +385,6 @@ jobs:
390385 - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }}
391386 - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }}
392387 - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_host_archs) || '[]') }}
393- include :
394- - arch : x86_64
395- runner : ubuntu-24.04
396- - arch : aarch64
397- runner : ubuntu-24.04-arm
398388 container :
399389 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
400390 steps :
0 commit comments