|
50 | 50 | type: string |
51 | 51 | description: "Linux OS version list (JSON)" |
52 | 52 | default: "[\"jammy\"]" |
| 53 | + linux_host_archs: |
| 54 | + type: string |
| 55 | + description: "Linux arch list (JSON)" |
| 56 | + default: "[\"x86_64\"]" |
53 | 57 | linux_static_sdk_versions: |
54 | 58 | type: string |
55 | 59 | description: "Static Linux Swift SDK version list (JSON)" |
@@ -299,17 +303,24 @@ jobs: |
299 | 303 | timeout-minutes: 60 |
300 | 304 |
|
301 | 305 | linux-build: |
302 | | - name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }}) |
303 | | - runs-on: ubuntu-latest |
| 306 | + name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }}) |
| 307 | + runs-on: ${{ matrix.runner }} |
304 | 308 | strategy: |
305 | 309 | fail-fast: false |
306 | 310 | matrix: |
307 | 311 | swift_version: ${{ fromJson(inputs.linux_swift_versions) }} |
308 | 312 | os_version: ${{ fromJson(inputs.linux_os_versions) }} |
| 313 | + arch: ${{ fromJson(inputs.linux_host_archs) }} |
309 | 314 | exclude: |
310 | 315 | - ${{ fromJson(inputs.linux_exclude_swift_versions) }} |
311 | 316 | - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }} |
312 | 317 | - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }} |
| 318 | + - ${{ 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 |
313 | 324 | container: |
314 | 325 | image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} |
315 | 326 | steps: |
@@ -366,17 +377,24 @@ jobs: |
366 | 377 | run: ${{ inputs.linux_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }} |
367 | 378 |
|
368 | 379 | linux-static-sdk-build: |
369 | | - name: Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }}) |
370 | | - runs-on: ubuntu-latest |
| 380 | + name: Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }}) |
| 381 | + runs-on: ${{ matrix.runner }} |
371 | 382 | strategy: |
372 | 383 | fail-fast: false |
373 | 384 | matrix: |
374 | 385 | swift_version: ${{ fromJson(inputs.linux_static_sdk_versions) }} |
375 | 386 | os_version: ${{ fromJson(inputs.linux_os_versions) }} |
| 387 | + arch: ${{ fromJson(inputs.linux_host_archs) }} |
376 | 388 | exclude: |
377 | 389 | - ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }} |
378 | 390 | - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }} |
379 | 391 | - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }} |
| 392 | + - ${{ 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 |
380 | 398 | container: |
381 | 399 | image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} |
382 | 400 | steps: |
|
0 commit comments