Skip to content

Commit f48c989

Browse files
committed
Merge branch 'main' into feat/issue-384-slog-log-levels
# Conflicts: # go.mod
2 parents 513a07b + e574090 commit f48c989

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2351
-2956
lines changed

.github/dependabot.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ updates:
88
go-modules-root:
99
patterns:
1010
- "*"
11-
- package-ecosystem: gomod
12-
directory: /cmd/cli
13-
schedule:
14-
interval: weekly
15-
groups:
16-
go-modules-cli:
17-
patterns:
18-
- "*"
1911
- package-ecosystem: github-actions
2012
directory: /
2113
schedule:
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Bump llama.cpp
2+
3+
run-name: "Bump llama.cpp${{ inputs.tag && format(' to {0}', inputs.tag) || '' }}"
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
on:
10+
schedule:
11+
- cron: '0 5 * * 1'
12+
workflow_dispatch:
13+
inputs:
14+
tag:
15+
description: 'llama.cpp tag to bump to (e.g. b8068). Defaults to latest.'
16+
required: false
17+
type: string
18+
19+
jobs:
20+
bump:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
25+
with:
26+
submodules: recursive
27+
28+
- name: Bump llama.cpp
29+
id: bump
30+
run: |
31+
OUTPUT=$(./scripts/bump-llamacpp.sh ${{ inputs.tag }})
32+
echo "$OUTPUT"
33+
if git diff --cached --quiet; then
34+
echo "changed=false" >> "$GITHUB_OUTPUT"
35+
echo "### Already up to date" >> "$GITHUB_STEP_SUMMARY"
36+
else
37+
COMMIT_MSG=$(echo "$OUTPUT" | grep -oP "(?<=-m ').*(?=')")
38+
TAG=$(echo "$COMMIT_MSG" | grep -oP '[^/]+(?=\)$)')
39+
echo "commit-msg=$COMMIT_MSG" >> "$GITHUB_OUTPUT"
40+
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
41+
echo "changed=true" >> "$GITHUB_OUTPUT"
42+
echo "### $COMMIT_MSG" >> "$GITHUB_STEP_SUMMARY"
43+
fi
44+
45+
- name: Create pull request
46+
if: steps.bump.outputs.changed == 'true'
47+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
48+
with:
49+
token: ${{ secrets.GITHUB_TOKEN }}
50+
sign-commits: 'true'
51+
commit-message: ${{ steps.bump.outputs.commit-msg }}
52+
title: ${{ steps.bump.outputs.commit-msg }}
53+
body: |
54+
Bumps llama.cpp submodule.
55+
branch: bump-llamacpp-${{ steps.bump.outputs.tag }}
56+
base: main
57+
labels: dependencies
58+
delete-branch: true
59+
add-paths: llamacpp/native/vendor/llama.cpp

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ jobs:
5151
- name: Check go mod tidy
5252
run: |
5353
go mod tidy
54-
go mod tidy -C cmd/cli
55-
go work sync
56-
git diff --exit-code go.mod go.sum cmd/cli/go.mod cmd/cli/go.sum go.work go.work.sum
54+
git diff --exit-code go.mod go.sum
5755
5856
- name: Run tests with race detection
5957
run: go test -race ./...

.github/workflows/cli-build.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)