Skip to content

Commit ab995e8

Browse files
ObserverOfTimeObserverOfTime
authored andcommitted
ci: run on every OS
and update jextract URL
1 parent 081dbfe commit ab995e8

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

.github/workflows/ci.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
paths:
77
- pom.xml
88
- src/**
9+
- .github/workflows/ci.yml
910
pull_request:
1011
branches: [master]
1112
paths:
1213
- pom.xml
1314
- src/**
15+
- .github/workflows/ci.yml
1416

1517
concurrency:
1618
cancel-in-progress: true
@@ -23,7 +25,11 @@ permissions:
2325
jobs:
2426
test:
2527
name: Test package
26-
runs-on: ubuntu-latest
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
target: [ubuntu-latest, windows-latest, macos-latest]
32+
runs-on: ${{matrix.target}}
2733
steps:
2834
- name: Checkout repository
2935
uses: actions/checkout@v4
@@ -36,22 +42,38 @@ jobs:
3642
java-version: 22
3743
cache: maven
3844
- name: Get tree-sitter commit
45+
shell: sh
3946
run: printf 'TREE_SITTER_REF=%s\n' "$(git rev-parse HEAD:core)" >> "$GITHUB_ENV"
4047
- name: Set up tree-sitter
4148
uses: tree-sitter/setup-action/lib@v2
4249
with:
4350
tree-sitter-ref: ${{env.TREE_SITTER_REF}}
4451
- name: Set up tree-sitter-java
52+
shell: bash
4553
run: |-
4654
git clone --depth=1 https://github.com/tree-sitter/tree-sitter-java
47-
make -Ctree-sitter-java all install PREFIX="$RUNNER_TOOL_CACHE/tree-sitter/lib"
55+
cd tree-sitter-java
56+
cmake -B build \
57+
-DBUILD_SHARED_LIBS=ON \
58+
-DCMAKE_INSTALL_LIBDIR=lib \
59+
-DCMAKE_INSTALL_BINDIR=lib \
60+
-DCMAKE_INSTALL_PREFIX="$RUNNER_TOOL_CACHE/tree-sitter/lib"
61+
cmake --build build && cmake --install build --config Debug
4862
- name: Set up jextract
63+
shell: bash
4964
run: |-
50-
curl -LSs '${{env.JEXTRACT_URL}}' | tar xzf - -C "$RUNNER_TOOL_CACHE"
65+
if [[ $RUNNER_OS == Linux ]]; then
66+
JEXTRACT_URL+=_linux-x64_bin.tar.gz
67+
elif [[ $RUNNER_OS == macOS ]]; then
68+
JEXTRACT_URL+=_macos-aarch64_bin.tar.gz
69+
else
70+
JEXTRACT_URL+=_windows-x64_bin.tar.gz
71+
fi
72+
curl -LSs "$JEXTRACT_URL" | tar xzf - -C "$RUNNER_TOOL_CACHE"
5173
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
5274
env:
5375
# NOTE: keep this in sync with deploy, docs
54-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
76+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47
5577
- name: Run tests
5678
run: mvn --no-transfer-progress test
5779
- name: Patch SpotBugs SARIF report

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
4545
env:
4646
# NOTE: keep this in sync with ci, docs
47-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
47+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47_linux-x64_bin.tar.gz
4848
- name: Deploy to Maven Central
4949
run: mvn --no-transfer-progress deploy -Dspotbugs.skip=true
5050
env:

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
5252
env:
5353
# NOTE: keep this in sync with ci, deploy
54-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
54+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47_linux-x64_bin.tar.gz
5555
- name: Build javadoc
5656
run: mvn --no-transfer-progress javadoc:javadoc antrun:run@fix-javadoc
5757
- name: Upload pages artifact

0 commit comments

Comments
 (0)