|
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)" |
@@ -295,16 +299,22 @@ jobs: |
295 | 299 | timeout-minutes: 60 |
296 | 300 |
|
297 | 301 | linux-build: |
298 | | - name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }}) |
| 302 | + name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }}) |
299 | 303 | if: ${{ inputs.enable_linux_checks }} |
300 | | - runs-on: ubuntu-latest |
| 304 | + runs-on: ${{ matrix.runner }} |
301 | 305 | strategy: |
302 | 306 | fail-fast: false |
303 | 307 | matrix: |
304 | 308 | swift_version: ${{ fromJson(inputs.linux_swift_versions) }} |
305 | 309 | os_version: ${{ fromJson(inputs.linux_os_versions) }} |
| 310 | + arch: ${{ fromJson(inputs.linux_host_archs) }} |
306 | 311 | exclude: |
307 | 312 | - ${{ fromJson(inputs.linux_exclude_swift_versions) }} |
| 313 | + include: |
| 314 | + - arch: x86_64 |
| 315 | + runner: ubuntu-24.04 |
| 316 | + - arch: aarch64 |
| 317 | + runner: ubuntu-24.04-arm |
308 | 318 | container: |
309 | 319 | image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} |
310 | 320 | steps: |
@@ -361,16 +371,22 @@ jobs: |
361 | 371 | run: ${{ inputs.linux_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }} |
362 | 372 |
|
363 | 373 | linux-static-sdk-build: |
364 | | - name: Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }}) |
| 374 | + name: Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }}) |
365 | 375 | if: ${{ inputs.enable_linux_static_sdk_build }} |
366 | | - runs-on: ubuntu-latest |
| 376 | + runs-on: ${{ matrix.runner }} |
367 | 377 | strategy: |
368 | 378 | fail-fast: false |
369 | 379 | matrix: |
370 | 380 | swift_version: ${{ fromJson(inputs.linux_static_sdk_versions) }} |
371 | 381 | os_version: ${{ fromJson(inputs.linux_os_versions) }} |
| 382 | + arch: ${{ fromJson(inputs.linux_host_archs) }} |
372 | 383 | exclude: |
373 | 384 | - ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }} |
| 385 | + include: |
| 386 | + - arch: x86_64 |
| 387 | + runner: ubuntu-24.04 |
| 388 | + - arch: aarch64 |
| 389 | + runner: ubuntu-24.04-arm |
374 | 390 | container: |
375 | 391 | image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} |
376 | 392 | steps: |
|
0 commit comments