@@ -15,15 +15,15 @@ jobs:
15
15
license_header_check_project_name : Swift.org
16
16
17
17
test-java :
18
- name : Java tests (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
18
+ name : Test ( Java) ( ${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
19
19
runs-on : ubuntu-latest
20
20
strategy :
21
21
fail-fast : true
22
22
matrix :
23
23
swift_version : ['6.1.2']
24
24
os_version : ['jammy']
25
25
jdk_vendor : ['corretto']
26
- jdk_version : ['24 ']
26
+ jdk_version : ['21 ']
27
27
container :
28
28
image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
29
29
env :
@@ -41,15 +41,15 @@ jobs:
41
41
run : ./gradlew compileJmh --info
42
42
43
43
test-java-macos :
44
- name : Java tests (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
44
+ name : Test ( Java) ( ${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
45
45
runs-on : [self-hosted, macos, sequoia, ARM64]
46
46
strategy :
47
47
fail-fast : true
48
48
matrix :
49
49
swift_version : ['6.1.2']
50
50
os_version : ['macos']
51
51
jdk_vendor : ['corretto']
52
- jdk_version : ['24 ']
52
+ jdk_version : ['21 ']
53
53
env :
54
54
JAVA_HOME : " /usr/lib/jvm/default-jdk"
55
55
SWIFT_JAVA_VERBOSE : true
@@ -65,15 +65,15 @@ jobs:
65
65
run : ./gradlew compileJmh --info
66
66
67
67
test-swift :
68
- name : Swift tests (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
68
+ name : Test ( Swift) ( ${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
69
69
runs-on : ubuntu-latest
70
70
strategy :
71
71
fail-fast : false
72
72
matrix :
73
73
swift_version : ['6.1.2']
74
74
os_version : ['jammy']
75
75
jdk_vendor : ['corretto']
76
- jdk_version : ['24 ']
76
+ jdk_version : ['21 ']
77
77
container :
78
78
image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
79
79
env :
@@ -89,15 +89,15 @@ jobs:
89
89
run : " swift test"
90
90
91
91
test-swift-macos :
92
- name : Swift tests (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
92
+ name : Test ( Swift) ( ${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
93
93
runs-on : [self-hosted, macos, sequoia, ARM64]
94
94
strategy :
95
95
fail-fast : false
96
96
matrix :
97
97
swift_version : ['6.1.2']
98
98
os_version : ['macos']
99
99
jdk_vendor : ['corretto']
100
- jdk_version : ['24 ']
100
+ jdk_version : ['21 ']
101
101
env :
102
102
JAVA_HOME : " /usr/lib/jvm/default-jdk"
103
103
SWIFT_JAVA_VERBOSE : true
@@ -111,15 +111,15 @@ jobs:
111
111
run : " swift test"
112
112
113
113
verify-samples :
114
- name : Verify Sample ${{ matrix.sample_app }} (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
114
+ name : Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
115
115
runs-on : ubuntu-latest
116
116
strategy :
117
117
fail-fast : false
118
118
matrix :
119
119
swift_version : ['6.1.2']
120
120
os_version : ['jammy']
121
121
jdk_vendor : ['corretto']
122
- jdk_version : ['24 ']
122
+ jdk_version : ['21 ']
123
123
sample_app : [
124
124
' JavaDependencySampleApp' ,
125
125
' JavaKitSampleApp' ,
@@ -140,15 +140,15 @@ jobs:
140
140
run : .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
141
141
142
142
verify-samples-macos :
143
- name : Verify Sample ${{ matrix.sample_app }} (swift: ${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }} os :${{ matrix.os_version }})
143
+ name : Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift :${{ matrix.swift_version }} jdk :${{matrix.jdk_vendor }})
144
144
runs-on : [self-hosted, macos, sequoia, ARM64]
145
145
strategy :
146
146
fail-fast : false
147
147
matrix :
148
148
swift_version : ['6.1.2']
149
- os_version : ['sequoia ']
149
+ os_version : ['macos ']
150
150
jdk_vendor : ['corretto']
151
- jdk_version : ['24 ']
151
+ jdk_version : ['21 ']
152
152
sample_app : [
153
153
' JavaDependencySampleApp' ,
154
154
' JavaKitSampleApp' ,
0 commit comments