Merge branch 'frawhide' into mado/fix/throne

fix(throne): I guess we could try go mod tidy?
fix #13044 Signed-off-by: madomado <madonuko@outlook.com>
2026-06-15 16:10:38 +00:00 · 2026-06-15 21:33:40 +08:00 · 2026-06-12 14:14:05 +08:00
2 changed files with 3 additions and 2 deletions
@@ -63,8 +63,8 @@ jobs:
        if: ${{ !contains(matrix.pkg.labels.sccache, '0') }}
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
-          SCCACHE_GHA_VERSION: ${{ matrix.version }}-${{ matrix.pkg.arch }}
-          SCCACHE_GHA_CACHE_FROM: ${{ matrix.version }}-${{ matrix.pkg.arch }}
+          SCCACHE_GHA_VERSION: ${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          SCCACHE_GHA_CACHE_FROM: ${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
        with:
          script: |
            const script = require('./.github/scripts/configure-sccache.js')
@@ -54,6 +54,7 @@ sed -i 's~add_library(qhotkey 3rdparty/QHotkey/qhotkey.cpp)~add_library(qhotkey
 pushd core/server
 export GOBIN=$(pwd)/gobin
 export PATH="${PATH}:${GOBIN}"
+go mod tidy
 go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 go install github.com/chai2010/protorpc/protoc-gen-protorpc@latest
Author	SHA1	Message	Date
madomado	86bd5eb058	Merge branch 'frawhide' into mado/fix/throne	2026-06-15 21:33:40 +08:00
madomado	448ad0d511	fix(throne): I guess we could try go mod tidy? fix #13044 Signed-off-by: madomado <madonuko@outlook.com>	2026-06-12 14:14:05 +08:00