@@ -15,15 +15,15 @@ jobs:
1515 license_header_check_project_name : Swift.org
1616
1717 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 }})
1919 runs-on : ubuntu-latest
2020 strategy :
2121 fail-fast : true
2222 matrix :
2323 swift_version : ['6.1.2']
2424 os_version : ['jammy']
2525 jdk_vendor : ['corretto']
26- jdk_version : ['24 ']
26+ jdk_version : ['21 ']
2727 container :
2828 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
2929 env :
@@ -41,15 +41,15 @@ jobs:
4141 run : ./gradlew compileJmh --info
4242
4343 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 }})
4545 runs-on : [self-hosted, macos, sequoia, ARM64]
4646 strategy :
4747 fail-fast : true
4848 matrix :
4949 swift_version : ['6.1.2']
5050 os_version : ['macos']
5151 jdk_vendor : ['corretto']
52- jdk_version : ['24 ']
52+ jdk_version : ['21 ']
5353 env :
5454 JAVA_HOME : " /usr/lib/jvm/default-jdk"
5555 SWIFT_JAVA_VERBOSE : true
@@ -65,15 +65,15 @@ jobs:
6565 run : ./gradlew compileJmh --info
6666
6767 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 }})
6969 runs-on : ubuntu-latest
7070 strategy :
7171 fail-fast : false
7272 matrix :
7373 swift_version : ['6.1.2']
7474 os_version : ['jammy']
7575 jdk_vendor : ['corretto']
76- jdk_version : ['24 ']
76+ jdk_version : ['21 ']
7777 container :
7878 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
7979 env :
@@ -89,15 +89,15 @@ jobs:
8989 run : " swift test"
9090
9191 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 }})
9393 runs-on : [self-hosted, macos, sequoia, ARM64]
9494 strategy :
9595 fail-fast : false
9696 matrix :
9797 swift_version : ['6.1.2']
9898 os_version : ['macos']
9999 jdk_vendor : ['corretto']
100- jdk_version : ['24 ']
100+ jdk_version : ['21 ']
101101 env :
102102 JAVA_HOME : " /usr/lib/jvm/default-jdk"
103103 SWIFT_JAVA_VERBOSE : true
@@ -111,15 +111,15 @@ jobs:
111111 run : " swift test"
112112
113113 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 }})
115115 runs-on : ubuntu-latest
116116 strategy :
117117 fail-fast : false
118118 matrix :
119119 swift_version : ['6.1.2']
120120 os_version : ['jammy']
121121 jdk_vendor : ['corretto']
122- jdk_version : ['24 ']
122+ jdk_version : ['21 ']
123123 sample_app : [
124124 ' JavaDependencySampleApp' ,
125125 ' JavaKitSampleApp' ,
@@ -140,15 +140,15 @@ jobs:
140140 run : .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
141141
142142 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 }})
144144 runs-on : [self-hosted, macos, sequoia, ARM64]
145145 strategy :
146146 fail-fast : false
147147 matrix :
148148 swift_version : ['6.1.2']
149- os_version : ['sequoia ']
149+ os_version : ['macos ']
150150 jdk_vendor : ['corretto']
151- jdk_version : ['24 ']
151+ jdk_version : ['21 ']
152152 sample_app : [
153153 ' JavaDependencySampleApp' ,
154154 ' JavaKitSampleApp' ,
0 commit comments