Skip to content

Commit d4d4b1d

Browse files
committed
Update version matrix in verification workflows
1 parent 71ca6d1 commit d4d4b1d

File tree

2 files changed

+28
-18
lines changed

2 files changed

+28
-18
lines changed

Diff for: .github/workflows/cross-platform-testing-build-from-source.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,23 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019]
39-
java-version: [ '8', '11', '17' ]
38+
# Only the latest available version of each OS is tested
39+
# Both macOS 13 and 14 are tested because they use different architectures
40+
os:
41+
- ubuntu-24.04
42+
- macos-13 # x86_64
43+
- macos-14 # aarch64
44+
- windows-2022
45+
# Only LTS versions greater than 8 are tested
46+
java-version: [ '8', '11', '17', '21' ]
4047
include:
41-
- os: ubuntu-20.04
48+
- os: ubuntu-24.04
4249
shell: bash
43-
- os: ubuntu-22.04
50+
- os: macos-13
4451
shell: bash
45-
- os: macos-11
52+
- os: macos-14
4653
shell: bash
47-
- os: macos-12
48-
shell: bash
49-
- os: windows-2019
54+
- os: windows-2022
5055
shell: wsl-bash
5156
defaults:
5257
run:
@@ -73,7 +78,7 @@ jobs:
7378
uses: actions/setup-java@v4
7479
with:
7580
java-version: ${{ matrix.java-version }}
76-
distribution: 'temurin'
81+
distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64
7782
- name: Download built script artifacts
7883
uses: actions/download-artifact@v4
7984
with:

Diff for: .github/workflows/cross-platform-testing-use-development-release.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,23 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019]
18-
java-version: [ '8', '11', '17' ]
17+
# Only the latest available version of each OS is tested
18+
# Both macOS 13 and 14 are tested because they use different architectures
19+
os:
20+
- ubuntu-24.04
21+
- macos-13 # x86_64
22+
- macos-14 # aarch64
23+
- windows-2022
24+
# Only LTS versions greater than 8 are tested
25+
java-version: [ '8', '11', '17', '21' ]
1926
include:
20-
- os: ubuntu-20.04
27+
- os: ubuntu-24.04
2128
shell: bash
22-
- os: ubuntu-22.04
29+
- os: macos-13
2330
shell: bash
24-
- os: macos-11
31+
- os: macos-14
2532
shell: bash
26-
- os: macos-12
27-
shell: bash
28-
- os: windows-2019
33+
- os: windows-2022
2934
shell: wsl-bash
3035
defaults:
3136
run:
@@ -52,7 +57,7 @@ jobs:
5257
uses: actions/setup-java@v4
5358
with:
5459
java-version: ${{ matrix.java-version }}
55-
distribution: 'temurin'
60+
distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64
5661
- name: Download and extract build validation Scripts
5762
run: |
5863
curl -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/development-latest/gradle-enterprise-gradle-build-validation-dev.zip

0 commit comments

Comments
 (0)