Merge branch 'dev' into feat/cache-service-v2-support

Author: LouisHaftmann

.github/workflows/release.yml

@@ -53,12 +53,16 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-          VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')
+          npx bumpp ${{ env[inputs.version] }} -y -r --commit "chore(release): v%s" --no-push
+
+          export VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//') 
           sed -E "s/^appVersion:.+$/appVersion: '$VERSION'/" -i install/kubernetes/github-actions-cache-server/Chart.yaml
           git stage install/kubernetes/github-actions-cache-server/Chart.yaml
-          git commit -nm "chore(release): update helm chart appVersion to $VERSION"
+          git commit -n --no-edit --amend
+          git tag -f "v$VERSION"
 
-          npx bumpp ${{ env[inputs.version] }} -y -r --commit "chore(release): v%s"
+          git push origin dev
+          git push origin --tags
 
           echo "RELEASE_REF=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
 

Dockerfile

@@ -5,8 +5,7 @@ ENV BUILD_HASH=${BUILD_HASH}
 
 WORKDIR /app
 
-RUN corepack enable
-RUN corepack prepare pnpm@latest-9 --activate
+RUN npm install -g pnpm@latest-9
 
 COPY package.json pnpm-lock.yaml .npmrc ./
 COPY patches patches

install/kubernetes/github-actions-cache-server/Chart.yaml

@@ -21,4 +21,4 @@ version: 0.1.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: '4.0.1'
+appVersion: '4.0.3'

lib/db/index.ts

@@ -163,6 +163,10 @@ export async function findKeyMatch(
   }
 }
 
+export async function listEntriesByKey(db: DB, key: string) {
+  return db.selectFrom('cache_keys').where('key', '=', key).selectAll().execute()
+}
+
 export async function updateOrCreateKey(
   db: DB,
   {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "github-actions-cache-server",
   "type": "module",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "private": true,
   "packageManager": "[email protected]",
   "engines": {

routes/[token]/_apis/artifactcache/caches/index.get.ts

@@ -0,0 +1,33 @@
+import { z } from 'zod'
+
+import { auth } from '~/lib/auth'
+import { listEntriesByKey, useDB } from '~/lib/db'
+
+const queryParamSchema = z.object({
+  key: z.string().min(1),
+})
+
+export default defineEventHandler({
+  onRequest: [auth],
+  handler: async (event) => {
+    const parsedQuery = queryParamSchema.safeParse(getQuery(event))
+    if (!parsedQuery.success)
+      throw createError({
+        statusCode: 400,
+        statusMessage: `Invalid query parameters: ${parsedQuery.error.message}`,
+      })
+
+    const { key } = parsedQuery.data
+
+    const db = useDB()
+    const entries = await listEntriesByKey(db, key)
+
+    return {
+      totalCount: entries.length,
+      artifactCaches: entries.map((entry) => ({
+        cacheKey: entry.key,
+        cacheVersion: entry.version,
+      })),
+    }
+  },
+})