Skip to content

Commit 0d966cb

Browse files
Merge pull request #541 from janhq/update-dev-from-master-2026-05-31-01-18
Sync master with upstream release b9437
2 parents 86f3076 + aa46bda commit 0d966cb

53 files changed

Lines changed: 1943 additions & 717 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "ccache-clear"
2+
description: "Delete all GitHub Actions caches matching a key prefix"
3+
inputs:
4+
key:
5+
description: "Cache key prefix to match and delete"
6+
required: true
7+
8+
runs:
9+
using: "composite"
10+
steps:
11+
- name: Clear caches
12+
shell: bash
13+
run: |
14+
CACHES=$(gh cache list --key "ccache-${{ inputs.key }}" --json id,key --jq '.[] | "\(.id) \(.key)"' 2>/dev/null)
15+
if [ -z "$CACHES" ]; then
16+
echo "No caches found with key prefix: ${{ inputs.key }}"
17+
exit 0
18+
fi
19+
while read -r id key; do
20+
echo "Deleting cache: $id ($key)"
21+
gh cache delete "$id"
22+
done <<< "$CACHES"

.github/workflows/build-cuda-windows.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ concurrency:
1313
queue: max
1414

1515
env:
16+
GH_TOKEN: ${{ github.token }}
1617
GGML_NLOOP: 3
1718
GGML_N_THREADS: 1
1819
LLAMA_ARG_LOG_COLORS: 1
@@ -23,6 +24,9 @@ jobs:
2324
cuda:
2425
runs-on: windows-2022
2526

27+
permissions:
28+
actions: write
29+
2630
strategy:
2731
matrix:
2832
cuda: ['12.4', '13.3']
@@ -36,7 +40,6 @@ jobs:
3640
uses: ggml-org/ccache-action@v1.2.21
3741
with:
3842
key: release-windows-2022-x64-cuda-${{ matrix.cuda }}
39-
append-timestamp: false # note: use this only with non-concurrent jobs!
4043

4144
- name: Install Cuda Toolkit
4245
uses: ./.github/actions/windows-setup-cuda
@@ -67,9 +70,17 @@ jobs:
6770
cmake --build build --config Release -j %NINJA_JOBS% -t ggml
6871
cmake --build build --config Release
6972
73+
- name: ccache-clear
74+
uses: ./.github/actions/ccache-clear
75+
with:
76+
key: release-windows-2022-x64-cuda-${{ matrix.cuda }}
77+
7078
hip:
7179
runs-on: windows-2022
7280

81+
permissions:
82+
actions: write
83+
7384
env:
7485
# Make sure this is in sync with build-cache.yml
7586
HIPSDK_INSTALLER_VERSION: "26.Q1"
@@ -125,7 +136,6 @@ jobs:
125136
# to populate the ccache for the release with manual runs of this workflow
126137
#key: release-windows-2022-x64-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ matrix.name }}
127138
key: cuda-windows-2022-x64-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ matrix.name }}
128-
append-timestamp: false # note: use this only with non-concurrent jobs!
129139

130140
- name: Build
131141
id: cmake_build
@@ -144,3 +154,9 @@ jobs:
144154
-DGPU_TARGETS="gfx1100" `
145155
-DGGML_RPC=ON
146156
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
157+
158+
- name: ccache-clear
159+
uses: ./.github/actions/ccache-clear
160+
with:
161+
#key: release-windows-2022-x64-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ matrix.name }}
162+
key: cuda-windows-2022-x64-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ matrix.name }}

0 commit comments

Comments
 (0)