Skip to content

Commit e96b1ad

Browse files
Revert the matrix skipping changes (#234)
1 parent c188fe5 commit e96b1ad

1 file changed

Lines changed: 8 additions & 20 deletions

File tree

.github/workflows/swift_package_test.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ on:
242242
jobs:
243243
macos-build:
244244
name: macOS (Xcode ${{ matrix.xcode_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
245+
if: ${{ inputs.enable_macos_checks }}
245246
runs-on: [self-hosted, macos, "${{ matrix.os_version }}", "${{ matrix.arch }}"]
246247
strategy:
247248
fail-fast: false
@@ -251,9 +252,6 @@ jobs:
251252
arch: ${{ fromJson(inputs.macos_archs) }}
252253
exclude:
253254
- ${{ fromJson(inputs.macos_exclude_xcode_versions) }}
254-
- ${{ fromJson((!inputs.enable_macos_checks && inputs.macos_xcode_versions) || '[]') }}
255-
- ${{ fromJson((!inputs.enable_macos_checks && inputs.macos_versions) || '[]') }}
256-
- ${{ fromJson((!inputs.enable_macos_checks && inputs.macos_archs) || '[]') }}
257255
steps:
258256
- name: Checkout repository
259257
uses: actions/checkout@v4
@@ -282,6 +280,7 @@ jobs:
282280

283281
ios-build:
284282
name: iOS (Build Only, Xcode ${{ matrix.xcode_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
283+
if: ${{ inputs.enable_ios_checks }}
285284
runs-on: [self-hosted, macos, "${{ matrix.os_version }}", "${{ matrix.arch }}"]
286285
strategy:
287286
fail-fast: false
@@ -291,9 +290,6 @@ jobs:
291290
arch: ${{ fromJson(inputs.ios_host_archs || inputs.macos_archs) }}
292291
exclude:
293292
- ${{ fromJson(inputs.ios_host_exclude_xcode_versions || inputs.macos_exclude_xcode_versions) }}
294-
- ${{ fromJson((!inputs.enable_ios_checks && (inputs.ios_host_xcode_versions || inputs.macos_xcode_versions)) || '[]') }}
295-
- ${{ fromJson((!inputs.enable_ios_checks && (inputs.ios_host_versions || inputs.macos_versions)) || '[]') }}
296-
- ${{ fromJson((!inputs.enable_ios_checks && (inputs.ios_host_archs || inputs.macos_archs)) || '[]') }}
297293
steps:
298294
- name: Checkout repository
299295
uses: actions/checkout@v4
@@ -320,6 +316,7 @@ jobs:
320316

321317
linux-build:
322318
name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
319+
if: ${{ inputs.enable_linux_checks }}
323320
runs-on: ${{ matrix.runner }}
324321
strategy:
325322
fail-fast: false
@@ -338,9 +335,6 @@ jobs:
338335
}}
339336
exclude:
340337
- ${{ fromJson(inputs.linux_exclude_swift_versions) }}
341-
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }}
342-
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }}
343-
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_host_archs) || '[]') }}
344338
- arch: x86_64
345339
runner: ubuntu-24.04-arm
346340
- arch: aarch64
@@ -402,6 +396,7 @@ jobs:
402396

403397
linux-static-sdk-build:
404398
name: Static Linux Swift SDK Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
399+
if: ${{ inputs.enable_linux_static_sdk_build }}
405400
runs-on: ${{ matrix.runner }}
406401
strategy:
407402
fail-fast: false
@@ -420,9 +415,6 @@ jobs:
420415
}}
421416
exclude:
422417
- ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }}
423-
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }}
424-
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }}
425-
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_host_archs) || '[]') }}
426418
- arch: x86_64
427419
runner: ubuntu-24.04-arm
428420
- arch: aarch64
@@ -483,6 +475,7 @@ jobs:
483475
484476
wasm-sdk-build:
485477
name: Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
478+
if: ${{ inputs.enable_wasm_sdk_build }}
486479
runs-on: ubuntu-latest
487480
strategy:
488481
fail-fast: false
@@ -491,8 +484,6 @@ jobs:
491484
os_version: ${{ fromJson(inputs.linux_os_versions) }}
492485
exclude:
493486
- ${{ fromJson(inputs.wasm_exclude_swift_versions) }}
494-
- ${{ fromJson((!inputs.enable_wasm_sdk_build && inputs.wasm_sdk_versions) || '[]') }}
495-
- ${{ fromJson((!inputs.enable_wasm_sdk_build && inputs.linux_os_versions) || '[]') }}
496487
container:
497488
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
498489
steps:
@@ -549,6 +540,7 @@ jobs:
549540
550541
embedded-wasm-sdk-build:
551542
name: Embedded Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
543+
if: ${{ inputs.enable_embedded_wasm_sdk_build }}
552544
runs-on: ubuntu-latest
553545
strategy:
554546
fail-fast: false
@@ -557,8 +549,6 @@ jobs:
557549
os_version: ${{ fromJson(inputs.linux_os_versions) }}
558550
exclude:
559551
- ${{ fromJson(inputs.wasm_exclude_swift_versions) }}
560-
- ${{ fromJson((!inputs.enable_embedded_wasm_sdk_build && inputs.wasm_sdk_versions) || '[]') }}
561-
- ${{ fromJson((!inputs.enable_embedded_wasm_sdk_build && inputs.linux_os_versions) || '[]') }}
562552
container:
563553
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
564554
steps:
@@ -615,6 +605,7 @@ jobs:
615605
616606
android-sdk-build:
617607
name: Swift SDK for Android Build (${{ matrix.swift_version }} - NDK ${{ matrix.ndk_version }})
608+
if: ${{ inputs.enable_android_sdk_build }}
618609
runs-on: ubuntu-latest
619610
strategy:
620611
fail-fast: false
@@ -623,8 +614,6 @@ jobs:
623614
ndk_version: ${{ fromJson(inputs.android_ndk_versions) }}
624615
exclude:
625616
- ${{ fromJson(inputs.android_exclude_swift_versions) }}
626-
- ${{ fromJson((!(inputs.enable_android_sdk_build || inputs.enable_android_sdk_checks) && inputs.android_sdk_versions) || '[]') }}
627-
- ${{ fromJson((!(inputs.enable_android_sdk_build || inputs.enable_android_sdk_checks) && inputs.android_ndk_versions) || '[]') }}
628617
steps:
629618
- name: Swift version
630619
run: swift --version
@@ -686,6 +675,7 @@ jobs:
686675
687676
windows-build:
688677
name: Windows (${{ matrix.swift_version }} - ${{ matrix.os_version }})
678+
if: ${{ inputs.enable_windows_checks }}
689679
runs-on: ${{ matrix.os_version }}
690680
strategy:
691681
fail-fast: false
@@ -694,8 +684,6 @@ jobs:
694684
os_version: ${{ fromJson(inputs.windows_os_versions) }}
695685
exclude:
696686
- ${{ fromJson(inputs.windows_exclude_swift_versions) }}
697-
- ${{ fromJson((!inputs.enable_windows_checks && inputs.windows_swift_versions) || '[]') }}
698-
- ${{ fromJson((!inputs.enable_windows_checks && inputs.windows_os_versions) || '[]') }}
699687
steps:
700688
- name: Checkout repository
701689
uses: actions/checkout@v4

0 commit comments

Comments
 (0)