Skip to content

Commit 088c334

Browse files
committed
Tweak macOS related CI steps and stop testing jdk 17
1 parent 3435479 commit 088c334

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ jobs:
1818
mac-backend: jdk
1919
- image: macos-latest
2020
mac-backend: fsevents
21+
- image: macos-13
22+
mac-backend: fsevents
2123
- image: windows-latest
22-
jdk: [11, 17, 21]
24+
jdk: [11, 21]
2325

2426
fail-fast: false
2527
runs-on: ${{ matrix.os.image }}
@@ -32,9 +34,8 @@ jobs:
3234
java-version: ${{ matrix.jdk }}
3335
distribution: 'temurin'
3436
cache: 'maven'
35-
#- uses: actions-rust-lang/setup-rust-toolchain@v1
3637
- run: ./update-rust-jni-libs.sh -r
37-
if: ${{ matrix.os.image == 'macos-latest' }}
38+
if: startsWith(matrix.os.image, 'macos-')
3839

3940
- name: test
4041
run: mvn -B clean test "-Dwatch.mac.backend=${{ matrix.os.mac-backend }}"

.github/workflows/release.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ on:
44
types: [created]
55
jobs:
66
publish:
7-
runs-on: ubuntu-latest
7+
runs-on: macos-latest # for now build on macos for the jni
88
steps:
99
- uses: actions/checkout@v4
10+
11+
# build jni libs on osx
12+
- run: ./update-rust-jni-libs.sh -r
13+
1014
- uses: actions/setup-java@v4
1115
with:
1216
java-version: '11'
@@ -22,4 +26,4 @@ jobs:
2226
env:
2327
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
2428
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
25-
GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
29+
GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}

0 commit comments

Comments
 (0)