Skip to content

Commit bbff7e9

Browse files
committed
Lock MacOS version to 13. (opensearch-project#961)
Signed-off-by: dblock <dblock@amazon.com>
1 parent 8589020 commit bbff7e9

2 files changed

Lines changed: 21 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 11, 17, 21 ]
11-
os: [ubuntu-latest, windows-latest, macOS-latest]
11+
os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
1212
steps:
1313
- name: Checkout Java Client
1414
uses: actions/checkout@v3

.github/workflows/test-unit.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
java: [ 8, 11, 17, 21 ]
10+
java: [ 11, 17, 21 ]
1111
os: [ubuntu-latest, windows-latest, macOS-latest]
1212
steps:
1313
- name: Checkout Java Client
@@ -21,17 +21,30 @@ jobs:
2121
cache: 'gradle'
2222

2323
- name: Run Unit Test
24-
if: ${{ matrix.java != 8 }}
2524
run: ./gradlew clean unitTest
25+
26+
test-java8:
27+
runs-on: ${{ matrix.os }}
28+
strategy:
29+
matrix:
30+
os: [ubuntu-latest, windows-latest, macOS-13]
31+
steps:
32+
- name: Checkout Java Client
33+
uses: actions/checkout@v3
2634

27-
- name: Set up JDK 11
35+
- name: Set up JDK 8 (Runtime)
36+
uses: actions/setup-java@v3
37+
with:
38+
java-version: 8
39+
distribution: temurin
40+
cache: gradle
41+
42+
- name: Set up JDK 11 (Tools)
2843
uses: actions/setup-java@v3
29-
if: ${{ matrix.java == 8 }}
3044
with:
3145
java-version: 11
32-
distribution: 'temurin'
33-
cache: 'gradle'
46+
distribution: temurin
47+
cache: gradle
3448

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

0 commit comments

Comments
 (0)