Skip to content

Commit

Permalink
Merge pull request #1606 from matthiasblaesing/update-ci
Browse files Browse the repository at this point in the history
Test on 23-ea and drop unnecessary mac-os-14 job (tests for mac OS by default run on arm64)
  • Loading branch information
matthiasblaesing committed Jun 1, 2024
2 parents f6670c6 + 07ea700 commit 4f94c57
Showing 1 changed file with 6 additions and 36 deletions.
42 changes: 6 additions & 36 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [8, 11, 17, 21]
os: [ubuntu-latest, macos-latest]
java: [8, 11, 17, 21, 23-ea]
os: [ubuntu-latest, macos-13, macos-latest]
exclude:
# 23-ea is not available for mac OS
- java: 23-ea
os: macos-latest
# Run all tests even if one fails
fail-fast: false
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
Expand Down Expand Up @@ -48,37 +52,3 @@ jobs:
run: |
ant test
ant test-platform
test-m1:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [21]
# macos-14 is documented to run on m1
# 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
os: [macos-14]
# Run all tests even if one fails
fail-fast: true
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
- name: Linux requirements
if: contains(matrix.os, 'ubuntu')
run: sudo apt-get -y install texinfo
- name: macOS requirements
if: contains(matrix.os, 'macos')
run: |
brew update
brew install automake --force
brew install libtool --force
brew install texinfo --force
- name: Run test
run: |
ant test
ant test-platform

0 comments on commit 4f94c57

Please sign in to comment.