Skip to content

Commit 57222a9

Browse files
bkhouribkhouri
committed
try something different
1 parent 0472150 commit 57222a9

File tree

2 files changed

+99
-31
lines changed

2 files changed

+99
-31
lines changed

‎.github/workflows/pull_request.yml‎

Lines changed: 59 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,66 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
tests:
15+
tests-native:
1616
needs: [soundness]
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
executableTargetBuildSystem: ["native"]
21-
buildSystem: ["native", "swiftbuild"]
22-
linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
23-
enable_windows_checks: [true]
24-
exclude:
25-
- buildSystem: "swiftbuild"
26-
linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
27-
- buildSystem: "swiftbuild"
28-
enable_windows_checks: true
29-
- buildSystem: "native"
30-
linuxSwiftVersion: '["nightly-main"]'
31-
name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
32-
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
33-
with:
34-
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
35-
linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
36-
linux_pre_build_command: ./.github/scripts/prebuild.sh
37-
linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
38-
windows_swift_versions: '["nightly-main"]'
39-
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
40-
windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
41-
enable_windows_checks: ${{ matrix.enable_windows_checks }}
42-
enable_ios_checks: true
43-
enable_macos_checks: true
44-
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
45-
macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
46-
ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
17+
runs-on: any
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
- name: Tests
22+
uses: ./.github/workflows/swift_test.yaml
23+
with:
24+
buildSystem: native
25+
executableTargetBuildSystem: native
26+
linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
27+
enableWindowsChecks: true
28+
29+
tests-swiftbuild:
30+
needs: [soundness]
31+
runs-on: any
32+
steps:
33+
- name: Checkout repository
34+
uses: actions/checkout@v4
35+
- name: Tests
36+
uses: ./.github/workflows/swift_test.yaml
37+
with:
38+
buildSystem: swiftbuild
39+
executableTargetBuildSystem: native
40+
linuxSwiftVersion: '["nightly-main"]'
41+
enableWindowsChecks: true
42+
43+
# tests:
44+
# needs: [soundness]
45+
# strategy:
46+
# fail-fast: false
47+
# matrix:
48+
# executableTargetBuildSystem: ["native"]
49+
# buildSystem: ["native", "swiftbuild"]
50+
# linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
51+
# enable_windows_checks: [true]
52+
# exclude:
53+
# - buildSystem: "swiftbuild"
54+
# linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
55+
# - buildSystem: "swiftbuild"
56+
# enable_windows_checks: true
57+
# - buildSystem: "native"
58+
# linuxSwiftVersion: '["nightly-main"]'
59+
# name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
60+
# uses: swiftlang/swift-package-manager/.github/workflows/swift_test.yml@0.0.2
61+
# with:
62+
# linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
63+
# linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
64+
# linux_pre_build_command: ./.github/scripts/prebuild.sh
65+
# linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
66+
# windows_swift_versions: '["nightly-main"]'
67+
# windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
68+
# windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
69+
# enable_windows_checks: ${{ matrix.enable_windows_checks }}
70+
# enable_ios_checks: true
71+
# enable_macos_checks: true
72+
# macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
73+
# macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
74+
# ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
4775

4876
build-using-swiftbuild:
4977
strategy:

‎.github/workflows/swift_test.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: SwiftPM Test Matrix
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
workflow_call:
8+
inputs:
9+
buildSystem:
10+
type: string
11+
required: true
12+
executableTargetBuildSystem:
13+
type: string
14+
required: true
15+
linuxSwiftVersion:
16+
type: string
17+
required: true
18+
enableWindowsChecks:
19+
type: boolean
20+
required: true
21+
22+
jobs:
23+
24+
matrix-test:
25+
name: Test (${{ inputs.buildSystem }}) (exectable target built using ${{ inputs.executableTargetBuildSystem }})
26+
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
27+
with:
28+
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
29+
linux_swift_versions: ${{ inputs.linuxSwiftVersion }}
30+
linux_pre_build_command: ./.github/scripts/prebuild.sh
31+
linux_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
32+
windows_swift_versions: '["nightly-main"]'
33+
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
34+
windows_build_command: 'Invoke-Program swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ inputs.buildSystem}}'
35+
enable_windows_checks: ${{ inputs.enableWindowsChecks }}
36+
enable_ios_checks: true
37+
enable_macos_checks: true
38+
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
39+
macos_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem}}'
40+
ios_build_command: 'swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ inputs.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ inputs.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'

0 commit comments

Comments
 (0)