Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/upload-artifact-retry/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ runs:
steps:
- id: first
continue-on-error: true
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
with:
name: ${{ inputs.name }}
path: ${{ inputs.path }}
if-no-files-found: error
- if: steps.first.outcome == 'failure'
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
with:
name: ${{ inputs.name }}-retry
path: ${{ inputs.path }}
Expand Down
96 changes: 48 additions & 48 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ env:
jobs:
fuzz:
name: Fuzz ${{ matrix.target }}
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
strategy:
# One target crashing or timing out must not cancel the other runs;
# each target's findings are independent.
fail-fast: false
matrix:
target: [parse_registry_ref, validate_reference, resolve_ollama_api]
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

# cargo-fuzz's libfuzzer-sys backend needs nightly (sanitizer/coverage
# instrumentation flags are unstable), unlike every other Rust step in
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
# GitHub notification and can triage and add the seed by hand.
- name: Upload crash artifacts
if: failure()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
with:
name: ${{ matrix.target }}-crash-artifacts
path: fuzz/artifacts/${{ matrix.target }}/
Expand All @@ -94,7 +94,7 @@ jobs:
# above on why this workflow makes no repo writes at all).
- name: Upload corpus
if: always()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
with:
name: ${{ matrix.target }}-corpus
path: fuzz/corpus/${{ matrix.target }}/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/retry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
github.event.workflow_run.event == 'push' && github.event.workflow_run.head_branch == 'main' &&
(github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'cancelled') &&
github.event.workflow_run.run_attempt < 3
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
permissions:
actions: write
checks: read
Expand Down
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ serde_json = { version = "1", features = ["raw_value"] }
yaml_serde = "0.10"
sha2 = "0.10"
hex = "0.4"
base64 = "0.22"
getrandom = "0.2"
base64 = "0.23"
getrandom = "0.4"
# `llmman run`'s image-path detection is a verbatim port of ollama's
# extractFileNames regex (cmd/interactive.go) — see cmd::run.
regex = "1"
anyhow = "1"
walkdir = "2"
dunce = "1"
chrono = { version = "0.4", features = ["serde"] }
dirs = "5"
dirs = "7"
tar = "0.4"
# `ws` for the web UI's terminal (`/llmman/shell`, src/cmd/serve/shell.rs).
axum = { version = "0.7", features = ["ws"] }
Expand All @@ -62,7 +62,7 @@ axum = { version = "0.7", features = ["ws"] }
# rather than have this pull a preference of its own.
axum-server = { version = "0.7", features = ["tls-rustls-no-provider"] }
rustls = { version = "0.23.46", default-features = false, features = ["ring", "std"] }
tower-http = { version = "0.6", features = ["cors"] }
tower-http = { version = "0.7", features = ["cors"] }
# The pty behind that terminal: one crate for Unix ptys and Windows
# ConPTY, and its default program is already "the user's login shell".
portable-pty = "0.9"
Expand All @@ -72,7 +72,7 @@ toml = { version = "0.8", default-features = false, features = ["parse"] }
# `llmman config set` edits a file people also hand-edit, so comments and
# layout have to survive a one-key write; serializing a `Conf` back out
# would drop both. Already compiled as `toml`'s own parser.
toml_edit = "0.22"
toml_edit = "0.25"
tokio = { version = "1", features = ["full"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "blocking", "rustls-tls", "http2", "charset"] }
futures = "0.3"
Expand All @@ -81,11 +81,11 @@ indicatif = "0.18"
console = { version = "0.16", default-features = false, features = ["std"] }
flate2 = "1"
zip = { version = "9", default-features = false, features = ["deflate"] }
libloading = "0.8"
libloading = "0.9"
multer = "3"
# Cosmos3 prompts are tokenized from the pack's tokenizer.json (mediagen::cosmos3);
# pure-Rust build, the pre-tokenizer regexes need fancy-regex's lookahead.
tokenizers = { version = "0.22", default-features = false, features = ["fancy-regex"] }
tokenizers = { version = "0.23", default-features = false, features = ["fancy-regex"] }
# conditioning images for image-to-video and action runs
image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }

Expand All @@ -96,7 +96,7 @@ image = { version = "0.25", default-features = false, features = ["png", "j
# here. Exact-pinned (not "1.6") since it's one of xet-core's own
# internal workspace crates, not an independently semver-stable API,
# despite being on crates.io.
hf-xet = "=1.6.0"
hf-xet = "=1.8.1"

# `s3://` source support (src/sources/s3.rs) — the official SDK rather
# than a hand-rolled SigV4 signer so the whole credential chain (env
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.activity:activity-ktx:1.9.3")
implementation("androidx.webkit:webkit:1.12.1")
implementation("androidx.core:core-ktx:1.16.0")
implementation("androidx.activity:activity-ktx:1.10.1")
implementation("androidx.webkit:webkit:1.18.0")
}

// ── llama.cpp: fetch the pinned Android release and stage what
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Android app: the web UI in a WebView, talking to an embedded `llmman serve`.
// See docs/android.md. Everything platform-specific lives in app/.
plugins {
id("com.android.application") version "8.7.3" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
id("com.android.application") version "8.13.2" apply false
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
}
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 1 addition & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.7-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 7 additions & 4 deletions android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 24 additions & 12 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading