Skip to content

Commit 102f883

Browse files
committed
ci: use setup-java to install multiple JDKs
1 parent a956e13 commit 102f883

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/actions/prepare_env/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ runs:
1111
- name: Set up JDK ${{ matrix.jdk_version }}
1212
uses: actions/setup-java@v4
1313
with:
14-
java-version: ${{ matrix.jdk_version }}
1514
distribution: ${{ matrix.jdk_vendor }}
15+
java-version: |
16+
24
17+
21
1618
cache: 'gradle'
1719
# - name: Cache JDKs
1820
# id: cache-jdk

.github/workflows/pull_request.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
swift_version: ['6.1.2']
2424
os_version: ['jammy']
2525
jdk_vendor: ['corretto']
26-
jdk_version: ['21']
2726
container:
2827
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
2928
env:
@@ -49,7 +48,6 @@ jobs:
4948
swift_version: ['6.1.2']
5049
os_version: ['macos']
5150
jdk_vendor: ['corretto']
52-
jdk_version: ['21']
5351
env:
5452
JAVA_HOME: "/usr/lib/jvm/default-jdk"
5553
SWIFT_JAVA_VERBOSE: true
@@ -73,7 +71,6 @@ jobs:
7371
swift_version: ['6.1.2']
7472
os_version: ['jammy']
7573
jdk_vendor: ['corretto']
76-
jdk_version: ['21']
7774
container:
7875
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
7976
env:
@@ -97,7 +94,6 @@ jobs:
9794
swift_version: ['6.1.2']
9895
os_version: ['macos']
9996
jdk_vendor: ['corretto']
100-
jdk_version: ['21']
10197
env:
10298
JAVA_HOME: "/usr/lib/jvm/default-jdk"
10399
SWIFT_JAVA_VERBOSE: true
@@ -119,7 +115,6 @@ jobs:
119115
swift_version: ['6.1.2']
120116
os_version: ['jammy']
121117
jdk_vendor: ['corretto']
122-
jdk_version: ['21']
123118
sample_app: [
124119
'JavaDependencySampleApp',
125120
'JavaKitSampleApp',
@@ -148,7 +143,6 @@ jobs:
148143
swift_version: ['6.1.2']
149144
os_version: ['macos']
150145
jdk_vendor: ['corretto']
151-
jdk_version: ['21']
152146
sample_app: [
153147
'JavaDependencySampleApp',
154148
'JavaKitSampleApp',

0 commit comments

Comments
 (0)