Skip to content

Commit 5a4e796

Browse files
committed
Update versions tested in CI scripts
Drop some older/add newer Java versions for GitHub Actions. For the Windows tests, The implementation here never honored the PG version setting for MinGW, instead just using whatever PG version pacman supplies, so just use PG: pacman for those entries to avoid confusion. As MinGW is only testing one PG version, use multiple JDK versions there. Try several different PG versions among the MSVC entries, without as many different JDK versions.
1 parent ae0b64e commit 5a4e796

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed

.github/workflows/ci-runnerpg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# cc: msvc
2929
# - os: windows-latest
3030
# cc: mingw
31-
java: [9, 11, 12, 17, 18, 19]
31+
java: [9, 11, 17, 19, 21]
3232

3333
steps:
3434

appveyor.yml

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,32 @@ environment:
1212
APPVEYOR_RDP_PASSWORD: MrRobot@2020
1313
VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
1414
matrix:
15-
# - SYS: MINGW
16-
# JDK: 9
17-
# PG: 12
18-
# - SYS: MINGW
19-
# JDK: 10
20-
# PG: 12
2115
- SYS: MINGW
2216
JDK: 11
23-
PG: 12
17+
PG: pacman
2418
- SYS: MINGW
25-
JDK: 12
26-
PG: 12
19+
JDK: 17
20+
PG: pacman
2721
- SYS: MINGW
28-
JDK: 13
29-
PG: 12
22+
JDK: 19
23+
PG: pacman
3024
- SYS: MINGW
31-
JDK: 14
32-
PG: 12
33-
- SYS: MINGW
34-
JDK: 15
35-
PG: 12
25+
JDK: 21
26+
PG: pacman
3627
- SYS: MSVC
37-
JDK: 15
38-
PG: 12
28+
JDK: 21
29+
PG: 15
3930
- SYS: MSVC
40-
JDK: 14
41-
PG: 12
31+
JDK: 21
32+
PG: 14
4233
- SYS: MSVC
43-
JDK: 13
44-
PG: 12
34+
JDK: 21
35+
PG: 13
4536
- SYS: MSVC
46-
JDK: 12
37+
JDK: 21
4738
PG: 12
4839
- SYS: MSVC
4940
JDK: 11
50-
PG: 12
51-
# - SYS: MSVC
52-
# JDK: 10
53-
# PG: 12
54-
# - SYS: MSVC
55-
# JDK: 9
56-
# PG: 12
57-
- SYS: MSVC
58-
JDK: 14
59-
PG: 11
60-
- SYS: MSVC
61-
JDK: 14
62-
PG: 10
63-
- SYS: MSVC
64-
JDK: 14
6541
PG: 9.6
6642
before_build:
6743
- ps: .appveyor/appveyor_download_java.ps1

0 commit comments

Comments
 (0)