Skip to content

Commit 20a38b5

Browse files
bernardladenthinbernardladenthin
authored
Merge pull request #234 from bernardladenthin/claude/sweet-lamport-ugvqea
Upgrade llama.cpp to b9637 and update GitHub Actions versions
2 parents 2c3d465 + acf7052 commit 20a38b5

11 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎.github/workflows/claude-code-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v6.0.3
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 1
2626

‎.github/workflows/claude.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
actions: read # Required for Claude to read CI results on PRs
3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v6.0.3
34+
uses: actions/checkout@v6
3535
with:
3636
fetch-depth: 1
3737

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
contents: read
2020
security-events: write
2121
steps:
22-
- uses: actions/checkout@v6.0.3
23-
- uses: actions/setup-java@v5.2.0
22+
- uses: actions/checkout@v6
23+
- uses: actions/setup-java@v5
2424
with: { java-version: '21', distribution: temurin }
2525
- uses: github/codeql-action/init@v4
2626
with: { languages: java, queries: +security-and-quality }

‎.github/workflows/publish.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
needs: startgate
6262
runs-on: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v6.0.3
65-
- uses: actions/setup-java@v5.2.0
64+
- uses: actions/checkout@v6
65+
- uses: actions/setup-java@v5
6666
with:
6767
java-version: '21'
6868
distribution: temurin
@@ -80,7 +80,7 @@ jobs:
8080
needs: startgate
8181
runs-on: ubuntu-latest
8282
steps:
83-
- uses: actions/checkout@v6.0.3
83+
- uses: actions/checkout@v6
8484
- name: Display CPU Info
8585
shell: bash
8686
run: |
@@ -104,7 +104,7 @@ jobs:
104104
needs: startgate
105105
runs-on: ubuntu-latest
106106
steps:
107-
- uses: actions/checkout@v6.0.3
107+
- uses: actions/checkout@v6
108108
- name: Display CPU Info
109109
shell: bash
110110
run: |
@@ -128,7 +128,7 @@ jobs:
128128
needs: startgate
129129
runs-on: ubuntu-latest
130130
steps:
131-
- uses: actions/checkout@v6.0.3
131+
- uses: actions/checkout@v6
132132
- name: Display CPU Info
133133
shell: bash
134134
run: |
@@ -152,7 +152,7 @@ jobs:
152152
needs: startgate
153153
runs-on: ubuntu-latest
154154
steps:
155-
- uses: actions/checkout@v6.0.3
155+
- uses: actions/checkout@v6
156156
- name: Display CPU Info
157157
shell: bash
158158
run: |
@@ -176,7 +176,7 @@ jobs:
176176
needs: startgate
177177
runs-on: ubuntu-latest
178178
steps:
179-
- uses: actions/checkout@v6.0.3
179+
- uses: actions/checkout@v6
180180
- name: Build libraries
181181
shell: bash
182182
run: |
@@ -196,8 +196,8 @@ jobs:
196196
needs: startgate
197197
runs-on: macos-15
198198
steps:
199-
- uses: actions/checkout@v6.0.3
200-
- uses: actions/setup-java@v5.2.0
199+
- uses: actions/checkout@v6
200+
- uses: actions/setup-java@v5
201201
with:
202202
distribution: 'temurin'
203203
java-version: ${{ env.JAVA_VERSION }}
@@ -227,8 +227,8 @@ jobs:
227227
needs: startgate
228228
runs-on: macos-14
229229
steps:
230-
- uses: actions/checkout@v6.0.3
231-
- uses: actions/setup-java@v5.2.0
230+
- uses: actions/checkout@v6
231+
- uses: actions/setup-java@v5
232232
with:
233233
distribution: 'temurin'
234234
java-version: ${{ env.JAVA_VERSION }}
@@ -258,7 +258,7 @@ jobs:
258258
needs: startgate
259259
runs-on: windows-2025-vs2026
260260
steps:
261-
- uses: actions/checkout@v6.0.3
261+
- uses: actions/checkout@v6
262262
- name: Display CPU Info
263263
shell: pwsh
264264
run: |
@@ -287,7 +287,7 @@ jobs:
287287
needs: startgate
288288
runs-on: windows-2025-vs2026
289289
steps:
290-
- uses: actions/checkout@v6.0.3
290+
- uses: actions/checkout@v6
291291
- name: Display CPU Info
292292
shell: pwsh
293293
run: |
@@ -320,8 +320,8 @@ jobs:
320320
needs: startgate
321321
runs-on: ubuntu-latest
322322
steps:
323-
- uses: actions/checkout@v6.0.3
324-
- uses: actions/setup-java@v5.2.0
323+
- uses: actions/checkout@v6
324+
- uses: actions/setup-java@v5
325325
with:
326326
distribution: 'temurin'
327327
java-version: ${{ env.JAVA_VERSION }}
@@ -344,8 +344,8 @@ jobs:
344344
needs: startgate
345345
runs-on: macos-15
346346
steps:
347-
- uses: actions/checkout@v6.0.3
348-
- uses: actions/setup-java@v5.2.0
347+
- uses: actions/checkout@v6
348+
- uses: actions/setup-java@v5
349349
with:
350350
distribution: 'temurin'
351351
java-version: ${{ env.JAVA_VERSION }}
@@ -379,7 +379,7 @@ jobs:
379379
needs: crosscompile-linux-x86_64
380380
runs-on: ubuntu-latest
381381
steps:
382-
- uses: actions/checkout@v6.0.3
382+
- uses: actions/checkout@v6
383383
- name: Display CPU Info
384384
shell: bash
385385
run: |
@@ -410,7 +410,7 @@ jobs:
410410
run: ls -l models/
411411
- name: Validate model files
412412
run: bash .github/validate-models.sh
413-
- uses: actions/setup-java@v5.2.0
413+
- uses: actions/setup-java@v5
414414
with:
415415
distribution: 'temurin'
416416
java-version: ${{ env.JAVA_VERSION }}
@@ -434,7 +434,7 @@ jobs:
434434
path: target/site/jacoco/jacoco.xml
435435
if-no-files-found: ignore
436436
- name: Run PIT mutation tests
437-
run: mvn --batch-mode --no-transfer-progress test-compile org.pitest:pitest-maven:mutationCoverage -Dmaven.javadoc.skip=true
437+
run: mvn --batch-mode --no-transfer-progress test-compile org.pitest:pitest-maven:mutationCoverage
438438
- name: Extract PIT survivors
439439
if: always()
440440
run: |
@@ -471,7 +471,7 @@ jobs:
471471
needs: build-macos-arm64-metal
472472
runs-on: macos-14
473473
steps:
474-
- uses: actions/checkout@v6.0.3
474+
- uses: actions/checkout@v6
475475
- name: Display CPU Info
476476
shell: bash
477477
run: |
@@ -500,7 +500,7 @@ jobs:
500500
run: ls -l models/
501501
- name: Validate model files
502502
run: bash .github/validate-models.sh
503-
- uses: actions/setup-java@v5.2.0
503+
- uses: actions/setup-java@v5
504504
with:
505505
distribution: 'temurin'
506506
java-version: ${{ env.JAVA_VERSION }}
@@ -535,7 +535,7 @@ jobs:
535535
needs: build-macos-arm64-no-metal
536536
runs-on: macos-15
537537
steps:
538-
- uses: actions/checkout@v6.0.3
538+
- uses: actions/checkout@v6
539539
- name: Display CPU Info
540540
shell: bash
541541
run: |
@@ -564,7 +564,7 @@ jobs:
564564
run: ls -l models/
565565
- name: Validate model files
566566
run: bash .github/validate-models.sh
567-
- uses: actions/setup-java@v5.2.0
567+
- uses: actions/setup-java@v5
568568
with:
569569
distribution: 'temurin'
570570
java-version: ${{ env.JAVA_VERSION }}
@@ -599,7 +599,7 @@ jobs:
599599
needs: build-macos-arm64-metal-15
600600
runs-on: macos-15
601601
steps:
602-
- uses: actions/checkout@v6.0.3
602+
- uses: actions/checkout@v6
603603
- name: Display CPU Info
604604
shell: bash
605605
run: |
@@ -628,7 +628,7 @@ jobs:
628628
run: ls -l models/
629629
- name: Validate model files
630630
run: bash .github/validate-models.sh
631-
- uses: actions/setup-java@v5.2.0
631+
- uses: actions/setup-java@v5
632632
with:
633633
distribution: 'temurin'
634634
java-version: ${{ env.JAVA_VERSION }}
@@ -663,7 +663,7 @@ jobs:
663663
needs: build-windows-x86_64
664664
runs-on: windows-2025-vs2026
665665
steps:
666-
- uses: actions/checkout@v6.0.3
666+
- uses: actions/checkout@v6
667667
- name: Display CPU Info
668668
shell: pwsh
669669
run: |
@@ -695,7 +695,7 @@ jobs:
695695
run: ls -l models/
696696
- name: Validate model files
697697
run: .github\validate-models.bat
698-
- uses: actions/setup-java@v5.2.0
698+
- uses: actions/setup-java@v5
699699
with:
700700
distribution: 'temurin'
701701
java-version: ${{ env.JAVA_VERSION }}
@@ -765,7 +765,7 @@ jobs:
765765
- test-java-windows-x86_64
766766
runs-on: ubuntu-latest
767767
steps:
768-
- uses: actions/checkout@v6.0.3
768+
- uses: actions/checkout@v6
769769
- uses: actions/download-artifact@v8
770770
with:
771771
pattern: "*-libraries"
@@ -779,7 +779,7 @@ jobs:
779779
with:
780780
name: android-libraries-opencl
781781
path: ${{ github.workspace }}/src/main/resources_android_opencl/net/ladenthin/llama/
782-
- uses: actions/setup-java@v5.2.0
782+
- uses: actions/setup-java@v5
783783
with:
784784
distribution: 'temurin'
785785
java-version: ${{ env.JAVA_VERSION }}
@@ -798,8 +798,8 @@ jobs:
798798
permissions:
799799
contents: write
800800
steps:
801-
- uses: actions/checkout@v6.0.3
802-
- uses: actions/setup-java@v5.2.0
801+
- uses: actions/checkout@v6
802+
- uses: actions/setup-java@v5
803803
with: { java-version: '${{ env.JAVA_VERSION }}', distribution: temurin }
804804
- uses: actions/download-artifact@v8
805805
with: { name: jacoco-report, path: target/site/jacoco/ }
@@ -848,7 +848,7 @@ jobs:
848848
permissions:
849849
contents: write
850850
steps:
851-
- uses: actions/checkout@v6.0.3
851+
- uses: actions/checkout@v6
852852
- uses: actions/download-artifact@v8
853853
with:
854854
pattern: "*-libraries"
@@ -863,7 +863,7 @@ jobs:
863863
name: android-libraries-opencl
864864
path: ${{ github.workspace }}/src/main/resources_android_opencl/net/ladenthin/llama/
865865
- name: Set up Maven Central Repository
866-
uses: actions/setup-java@v5.2.0
866+
uses: actions/setup-java@v5
867867
with:
868868
java-version: ${{ env.JAVA_VERSION }}
869869
distribution: 'temurin'
@@ -923,7 +923,7 @@ jobs:
923923
permissions:
924924
contents: write
925925
steps:
926-
- uses: actions/checkout@v6.0.3
926+
- uses: actions/checkout@v6
927927
- uses: actions/download-artifact@v8
928928
with:
929929
pattern: "*-libraries"
@@ -938,7 +938,7 @@ jobs:
938938
name: android-libraries-opencl
939939
path: ${{ github.workspace }}/src/main/resources_android_opencl/net/ladenthin/llama/
940940
- name: Set up Maven Central Repository
941-
uses: actions/setup-java@v5.2.0
941+
uses: actions/setup-java@v5
942942
with:
943943
java-version: ${{ env.JAVA_VERSION }}
944944
distribution: 'temurin'

‎.github/workflows/reuse.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
test:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v6.0.3
16+
- uses: actions/checkout@v6
1717
- uses: fsfe/reuse-action@v6

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
actions: read
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v6.0.3
28+
uses: actions/checkout@v6
2929
with:
3030
persist-credentials: false
3131

‎.github/workflows/sonarqube.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
name: Build and analyze
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
17+
- uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: 21
2424
distribution: 'zulu'
2525
- name: Cache SonarQube packages
26-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
26+
uses: actions/cache@v5
2727
with:
2828
path: ~/.sonar/cache
2929
key: ${{ runner.os }}-sonar
3030
restore-keys: ${{ runner.os }}-sonar
3131
- name: Cache Maven packages
32-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.m2
3535
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
66

77
Java bindings for [llama.cpp](https://github.com/ggerganov/llama.cpp) via JNI, providing a high-level API for LLM inference in Java. The Java layer communicates with a native C++ library through JNI.
88

9-
Current llama.cpp pinned version: **b9621**
9+
Current llama.cpp pinned version: **b9637**
1010

1111
## Upgrading CUDA Version
1212

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ set(LLAMA_BUILD_APP OFF CACHE BOOL "" FORCE)
139139
FetchContent_Declare(
140140
llama.cpp
141141
GIT_REPOSITORY https://github.com/ggerganov/llama.cpp.git
142-
GIT_TAG b9621
142+
GIT_TAG b9637
143143
)
144144
FetchContent_MakeAvailable(llama.cpp)
145145

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
**Build:**
22
![Java 8+](https://img.shields.io/badge/Java-8%2B-informational)
33
![Platform](https://img.shields.io/badge/Platform-Linux%20%7C%20macOS%20%7C%20Windows%20%7C%20Android-lightgrey)
4-
[![llama.cpp b9621](https://img.shields.io/badge/llama.cpp-%23b9621-informational)](https://github.com/ggml-org/llama.cpp/releases/tag/b9621)
4+
[![llama.cpp b9637](https://img.shields.io/badge/llama.cpp-%23b9637-informational)](https://github.com/ggml-org/llama.cpp/releases/tag/b9637)
55
[![JPMS](https://img.shields.io/badge/JPMS-modular%20JAR-25A162)](https://openjdk.org/projects/jigsaw/)
66
![JUnit](https://img.shields.io/badge/tested%20with-JUnit6-25A162)
77
[![JSpecify](https://img.shields.io/badge/JSpecify-1.0.0%20%40NullMarked-25A162)](https://jspecify.dev)

0 commit comments

Comments
 (0)