Skip to content

Commit 1c5584e

Browse files
ktosoktoso
authored
Merge pull request #255 from swiftlang/ktoso-patch-1
2 parents 6267c8f + bfc521e commit 1c5584e

File tree

1 file changed

+97
-7
lines changed

1 file changed

+97
-7
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 97 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
- name: Swift Test
6565
run: "swift test"
6666

67-
verify-samples:
68-
name: Verify Samples (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
67+
verify-sample-01:
68+
name: Verify Sample JavaDependencySampleApp (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
6969
runs-on: ubuntu-latest
7070
strategy:
7171
fail-fast: false
@@ -84,15 +84,105 @@ jobs:
8484
uses: ./.github/actions/prepare_env
8585
- name: "Verify Sample: JavaDependencySampleApp"
8686
run: .github/scripts/validate_sample.sh Samples/JavaDependencySampleApp
87-
- name: "Verify Sample: JavaKitSampleApp"
87+
verify-sample-02:
88+
name: Verify Sample JavaKitSampleApp (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
89+
runs-on: ubuntu-latest
90+
strategy:
91+
fail-fast: false
92+
matrix:
93+
# swift_version: ['nightly-main']
94+
swift_version: ['6.0.2']
95+
os_version: ['jammy']
96+
jdk_vendor: ['Corretto']
97+
container:
98+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
99+
env:
100+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
101+
steps:
102+
- uses: actions/checkout@v4
103+
- name: Prepare CI Environment
104+
uses: ./.github/actions/prepare_env
105+
- name: "Verify Sample"
88106
run: .github/scripts/validate_sample.sh Samples/JavaKitSampleApp
89-
- name: "Verify Sample: JavaProbablyPrime"
107+
verify-sample-03:
108+
name: Verify Sample JavaProbablyPrime (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
109+
runs-on: ubuntu-latest
110+
strategy:
111+
fail-fast: false
112+
matrix:
113+
# swift_version: ['nightly-main']
114+
swift_version: ['6.0.2']
115+
os_version: ['jammy']
116+
jdk_vendor: ['Corretto']
117+
container:
118+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
119+
env:
120+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
121+
steps:
122+
- uses: actions/checkout@v4
123+
- name: Prepare CI Environment
124+
uses: ./.github/actions/prepare_env
125+
- name: "Verify Sample"
90126
run: .github/scripts/validate_sample.sh Samples/JavaProbablyPrime
91-
- name: "Verify Sample: JavaSieve"
127+
verify-sample-04:
128+
name: Verify Sample JavaSieve (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
129+
runs-on: ubuntu-latest
130+
strategy:
131+
fail-fast: false
132+
matrix:
133+
# swift_version: ['nightly-main']
134+
swift_version: ['6.0.2']
135+
os_version: ['jammy']
136+
jdk_vendor: ['Corretto']
137+
container:
138+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
139+
env:
140+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
141+
steps:
142+
- uses: actions/checkout@v4
143+
- name: Prepare CI Environment
144+
uses: ./.github/actions/prepare_env
145+
- name: "Verify Sample"
92146
run: .github/scripts/validate_sample.sh Samples/JavaSieve
93-
- name: "Verify Sample: SwiftAndJavaJarSampleLib"
147+
verify-sample-05:
148+
name: Verify Sample SwiftAndJavaJarSampleLib (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
149+
runs-on: ubuntu-latest
150+
strategy:
151+
fail-fast: false
152+
matrix:
153+
# swift_version: ['nightly-main']
154+
swift_version: ['6.0.2']
155+
os_version: ['jammy']
156+
jdk_vendor: ['Corretto']
157+
container:
158+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
159+
env:
160+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
161+
steps:
162+
- uses: actions/checkout@v4
163+
- name: Prepare CI Environment
164+
uses: ./.github/actions/prepare_env
165+
- name: "Verify Sample"
94166
run: .github/scripts/validate_sample.sh Samples/SwiftAndJavaJarSampleLib
95-
- name: "Verify Sample: SwiftKitSampleApp"
167+
verify-sample-06:
168+
name: Verify Sample SwiftKitSampleApp (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
169+
runs-on: ubuntu-latest
170+
strategy:
171+
fail-fast: false
172+
matrix:
173+
# swift_version: ['nightly-main']
174+
swift_version: ['6.0.2']
175+
os_version: ['jammy']
176+
jdk_vendor: ['Corretto']
177+
container:
178+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
179+
env:
180+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
181+
steps:
182+
- uses: actions/checkout@v4
183+
- name: Prepare CI Environment
184+
uses: ./.github/actions/prepare_env
185+
- name: "Verify Sample"
96186
run: .github/scripts/validate_sample.sh Samples/SwiftKitSampleApp
97187
# TODO: Benchmark compile crashes in CI, enable when nightly toolchains in better shape.
98188
# - name: Build (Swift) Benchmarks

0 commit comments

Comments
 (0)