Merge pull request #472 from bernardladenthin/claude/hopeful-pascal-9jlbqb

Refactor natives jar distribution and build infrastructure

Author: bernardladenthin

.editorconfig

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
-# SPDX-FileCopyrightText: 2023-2025 Konstantin Herud
 #
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT OR Apache-2.0
 
 # https://editorconfig.org
 root = true

.gitattributes

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
-# SPDX-FileCopyrightText: 2023-2025 Konstantin Herud
 #
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT OR Apache-2.0
 
 * text=auto eol=lf
+*.gguf binary

.github/CODEOWNERS

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
+#
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 # Default reviewer for all paths.
 * @bernardladenthin

.github/FUNDING.yml

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
-# SPDX-FileCopyrightText: 2023-2025 Konstantin Herud
 #
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT OR Apache-2.0
 
 # Sponsorship configuration for github.com/bernardladenthin.
 # Uncomment any line below to advertise a funding channel on the repository.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
-# SPDX-FileCopyrightText: 2023-2025 Konstantin Herud
 #
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT OR Apache-2.0
 
 blank_issues_enabled: false
 contact_links:

.github/actions/build-core/action.yml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
+#
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
+# Builds the parent POM and net.ladenthin:llama -- plus further reactor modules when asked -- as plain
+# Java: no tests, no checks, no javadoc or sources jar, no signing. With `install` they land in the
+# local Maven repository for a job that builds a module or an artifact on top of them; with `package`
+# only in target/. The one place for that skip-flag list, which nine jobs used to repeat.
+# Needs the repository checked out and a JDK set up.
+name: Build the core classes
+description: Build parent + net.ladenthin:llama (and more reactor modules) without tests, checks, javadoc or signing.
+inputs:
+  modules:
+    description: The reactor modules to build (-pl); their reactor dependencies are built too (-am).
+    required: false
+    default: llama
+  goal:
+    description: install (into the local Maven repository) or package (target/ only).
+    required: false
+    default: install
+runs:
+  using: composite
+  steps:
+    - name: mvn -pl ${{ inputs.modules }} -am ${{ inputs.goal }} (no tests, checks or signing)
+      shell: bash
+      env:
+        MODULES: ${{ inputs.modules }}
+        GOAL: ${{ inputs.goal }}
+      run: >
+        mvn -B --no-transfer-progress -pl "$MODULES" -am -DskipTests -Denforcer.skip=true
+        -Dspotless.check.skip=true -Dspotbugs.skip=true
+        -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dgpg.skip=true "$GOAL"

.github/actions/install-sccache-windows/action.yml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
+#
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
+# Puts sccache on PATH on a Windows runner, from the release zip (x86_64, or the native
+# aarch64-pc-windows-msvc build on windows-11-arm, where it wraps clang-cl). The caller keeps the
+# `if:` (USE_CACHE and a Depot token present) and `continue-on-error: true`: a failed install is
+# only a slower build, because build.bat probes sccache before trusting it and retries a build that
+# fails with it as the launcher once uncached (CLAUDE.md, "sccache on every Windows Ninja job").
+# Keep `version` equal to SCCACHE_DL_VERSION in .github/build.sh (the Linux fetch).
+name: Install sccache (Windows)
+description: Download the sccache release zip matching the runner's architecture and add it to PATH.
+inputs:
+  version:
+    description: sccache release to install.
+    required: false
+    default: '0.18.0'
+runs:
+  using: composite
+  steps:
+    - name: Install sccache ${{ inputs.version }}
+      shell: pwsh
+      env:
+        SCCACHE_VERSION: ${{ inputs.version }}
+      run: |
+        $arch = if ($env:RUNNER_ARCH -eq 'ARM64') { 'aarch64' } else { 'x86_64' }
+        $rel = "sccache-v$env:SCCACHE_VERSION-$arch-pc-windows-msvc"
+        $url = "https://github.com/mozilla/sccache/releases/download/v$env:SCCACHE_VERSION/$rel.zip"
+        Write-Host "Downloading $url"
+        Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\sccache.zip"
+        Expand-Archive -Path "$env:RUNNER_TEMP\sccache.zip" -DestinationPath "$env:RUNNER_TEMP\sccache" -Force
+        Add-Content -Path $env:GITHUB_PATH -Value "$env:RUNNER_TEMP\sccache\$rel"

.github/actions/publish-cpu-aar-local/action.yml

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
+#
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
+# Downloads the Android CPU natives (arm64-v8a for devices, x86_64 for the emulator), stages them where
+# llama-android's Gradle build expects them and publishes the CPU AAR to mavenLocal -- what the
+# emulator test and the two llmservice jobs consume. Needs the repository checked out, the core jar
+# built (build-core, `package`) and Gradle on PATH; the calling job must `need` both Android CPU
+# build jobs.
+name: Publish the CPU AAR to mavenLocal
+description: Download + stage the Android CPU natives (arm64-v8a, x86_64) and publish the llama-android AAR to mavenLocal.
+runs:
+  using: composite
+  steps:
+    - name: Download Android CPU natives (arm64)
+      uses: actions/download-artifact@v8
+      with:
+        name: natives-cpu-android-aarch64
+        path: stage/cpu/
+    - name: Download Android CPU natives (x86_64)
+      uses: actions/download-artifact@v8
+      with:
+        name: natives-cpu-android-x86-64
+        path: stage/cpu-x86_64/
+    - name: Stage natives + publish the CPU AAR to mavenLocal
+      shell: bash
+      run: |
+        mkdir -p llama-android/natives/cpu/arm64-v8a llama-android/natives/cpu/x86_64
+        cp stage/cpu/Linux-Android/aarch64/cpu/libjllama.so llama-android/natives/cpu/arm64-v8a/
+        cp stage/cpu-x86_64/Linux-Android/x86_64/cpu/libjllama.so llama-android/natives/cpu/x86_64/
+        gradle -p llama-android publishLlamaAndroidPublicationToMavenLocal

.github/actions/restore-models/action.yml

@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
+#
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
+# Restores the shared GGUF model cache and validates it -- the one place a job gets its models.
+# The download-models job is the cache's ONLY writer (actions/cache, same key); every consumer
+# uses this restore-only action, so a job running on a cache miss can never re-save an empty or
+# partial entry under the immutable key. enableCrossOsArchive matches the writer's entry version,
+# so macOS and Windows restore the same ubuntu-built entry (without it the entries are per OS, and
+# the unreachable Windows-side one was once found re-saved EMPTY after an eviction). The key is
+# the hash of .github/models.csv, so editing the manifest creates a fresh complete entry.
+# validate-models.sh then fails a partial or absent restore loudly instead of letting the
+# model-backed tests self-skip. Needs the repository checked out.
+name: Restore GGUF models
+description: Restore the shared GGUF model cache (written by download-models) and validate every model of .github/models.csv.
+inputs:
+  fail-on-cache-miss:
+    description: Fail at the restore already when the cache entry is missing ('true' in verify-model-cache).
+    required: false
+    default: 'false'
+runs:
+  using: composite
+  steps:
+    - name: Restore shared GGUF model cache (populated by download-models; no re-download)
+      uses: actions/cache/restore@v6
+      with:
+        path: models/
+        key: gguf-models-${{ hashFiles('.github/models.csv') }}
+        enableCrossOsArchive: true
+        fail-on-cache-miss: ${{ inputs.fail-on-cache-miss }}
+    - name: Validate model files
+      shell: bash
+      run: bash .github/validate-models.sh

.github/android-consumer-test/README.md

@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2026 Bernard Ladenthin <bernard.ladenthin@gmail.com>
 
-SPDX-License-Identifier: MIT
+SPDX-License-Identifier: MIT OR Apache-2.0
 -->
 # llama-android consumer-test fixture (CI only)