Skip to content

Commit

Permalink
Lock MacOS version to 13. (opensearch-project#961)
Browse files Browse the repository at this point in the history
Signed-off-by: dblock <dblock@amazon.com>
  • Loading branch information
dblock committed Apr 30, 2024
1 parent 8589020 commit bbff7e9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
java: [ 11, 17, 21 ]
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
steps:
- name: Checkout Java Client
uses: actions/checkout@v3
Expand Down
27 changes: 20 additions & 7 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ 8, 11, 17, 21 ]
java: [ 11, 17, 21 ]
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- name: Checkout Java Client
Expand All @@ -21,17 +21,30 @@ jobs:
cache: 'gradle'

- name: Run Unit Test
if: ${{ matrix.java != 8 }}
run: ./gradlew clean unitTest

test-java8:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-13]
steps:
- name: Checkout Java Client
uses: actions/checkout@v3

- name: Set up JDK 11
- name: Set up JDK 8 (Runtime)
uses: actions/setup-java@v3
with:
java-version: 8
distribution: temurin
cache: gradle

- name: Set up JDK 11 (Tools)
uses: actions/setup-java@v3
if: ${{ matrix.java == 8 }}
with:
java-version: 11
distribution: 'temurin'
cache: 'gradle'
distribution: temurin
cache: gradle

- name: Run Unit Test
if: ${{ matrix.java == 8 }}
run: ./gradlew clean unitTest -D"runtime.java=8"

0 comments on commit bbff7e9

Please sign in to comment.