Skip to content

Commit 4f94c57

Browse files
Merge pull request #1606 from matthiasblaesing/update-ci
Test on 23-ea and drop unnecessary mac-os-14 job (tests for mac OS by default run on arm64)
2 parents f6670c6 + 07ea700 commit 4f94c57

File tree

1 file changed

+6
-36
lines changed

1 file changed

+6
-36
lines changed

Diff for: .github/workflows/ci.yaml

+6-36
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
java: [8, 11, 17, 21]
20-
os: [ubuntu-latest, macos-latest]
19+
java: [8, 11, 17, 21, 23-ea]
20+
os: [ubuntu-latest, macos-13, macos-latest]
21+
exclude:
22+
# 23-ea is not available for mac OS
23+
- java: 23-ea
24+
os: macos-latest
2125
# Run all tests even if one fails
2226
fail-fast: false
2327
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -48,37 +52,3 @@ jobs:
4852
run: |
4953
ant test
5054
ant test-platform
51-
52-
test-m1:
53-
runs-on: ${{ matrix.os }}
54-
strategy:
55-
matrix:
56-
java: [21]
57-
# macos-14 is documented to run on m1
58-
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
59-
os: [macos-14]
60-
# Run all tests even if one fails
61-
fail-fast: true
62-
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
63-
64-
steps:
65-
- uses: actions/checkout@v4
66-
- name: Set up JDK
67-
uses: actions/setup-java@v3
68-
with:
69-
java-version: ${{ matrix.java }}
70-
distribution: 'zulu'
71-
- name: Linux requirements
72-
if: contains(matrix.os, 'ubuntu')
73-
run: sudo apt-get -y install texinfo
74-
- name: macOS requirements
75-
if: contains(matrix.os, 'macos')
76-
run: |
77-
brew update
78-
brew install automake --force
79-
brew install libtool --force
80-
brew install texinfo --force
81-
- name: Run test
82-
run: |
83-
ant test
84-
ant test-platform

0 commit comments

Comments
 (0)