Skip to content

Commit 36cb245

Browse files
committed
split out JMH into separate job, remove redundant java_home env
1 parent 64328a7 commit 36cb245

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
container:
2727
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
2828
env:
29-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
3029
SWIFT_JAVA_VERBOSE: true
3130
steps:
3231
- uses: actions/checkout@v4
@@ -36,6 +35,24 @@ jobs:
3635
run: ./gradlew build -x test
3736
- name: Gradle :SwiftKit:check
3837
run: ./gradlew :SwiftKit:check --debug
38+
39+
benchmark-java:
40+
name: Benchmark (JMH) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
41+
runs-on: ubuntu-latest
42+
strategy:
43+
fail-fast: true
44+
matrix:
45+
swift_version: ['6.1.2']
46+
os_version: ['jammy']
47+
jdk_vendor: ['corretto']
48+
container:
49+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
50+
env:
51+
SWIFT_JAVA_VERBOSE: true
52+
steps:
53+
- uses: actions/checkout@v4
54+
- name: Prepare CI Environment
55+
uses: ./.github/actions/prepare_env
3956
- name: Gradle compile JMH benchmarks
4057
run: ./gradlew compileJmh --info
4158

@@ -49,7 +66,6 @@ jobs:
4966
os_version: ['macos']
5067
jdk_vendor: ['corretto']
5168
env:
52-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
5369
SWIFT_JAVA_VERBOSE: true
5470
steps:
5571
- uses: actions/checkout@v4
@@ -74,7 +90,6 @@ jobs:
7490
container:
7591
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
7692
env:
77-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
7893
SWIFT_JAVA_VERBOSE: true
7994
steps:
8095
- uses: actions/checkout@v4
@@ -95,7 +110,6 @@ jobs:
95110
os_version: ['macos']
96111
jdk_vendor: ['corretto']
97112
env:
98-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
99113
SWIFT_JAVA_VERBOSE: true
100114
steps:
101115
- uses: actions/checkout@v4
@@ -126,8 +140,6 @@ jobs:
126140
]
127141
container:
128142
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
129-
env:
130-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
131143
steps:
132144
- uses: actions/checkout@v4
133145
- name: Prepare CI Environment
@@ -152,8 +164,6 @@ jobs:
152164
'SwiftAndJavaJarSampleLib',
153165
'SwiftKitSampleApp',
154166
]
155-
env:
156-
JAVA_HOME: "/usr/lib/jvm/default-jdk"
157167
steps:
158168
- uses: actions/checkout@v4
159169
- name: Prepare CI Environment

0 commit comments

Comments
 (0)