From 55c18ef94489ec2ffe78a94e6cc92cf7737e8449 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Tue, 17 Jun 2025 00:56:14 +0200
Subject: [PATCH] use cache

---
 .github/workflows/test.yml |  4 ++++
 Makefile                   |  2 +-
 docker-bake.hcl            | 25 -------------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c1d96f88e..0961e65c4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,5 +27,9 @@ jobs:
         with:
           push: false
           builder: ${{ steps.buildx.outputs.name }}
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
+            *.output=type=docker
       - name: Run
         run: make login-lint
diff --git a/Makefile b/Makefile
index 5b4253a850..194d74cf6a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ login-help:
 	@echo "  clean-cache-keys        - Remove all cache keys."
 
 login-lint-build:
-	docker buildx bake --provenance=false --load --pull login-lint
+	docker buildx bake login-lint
 
 login-lint-run:
 	docker run --rm $(LOGIN_LINT_TAG) lint
diff --git a/docker-bake.hcl b/docker-bake.hcl
index b9388aa91e..0d955d6a2c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,9 +6,6 @@ group "default" {
 
 target "login-pnpm" {
   dockerfile = "dockerfiles/login-pnpm.Dockerfile"
-  output = ["type=docker"]
-  cache-from = ["type=gha,scope=login-pnpm"]
-  cache-to   = ["type=gha,scope=login-pnpm,ignore-error=true,mode=max"]
 }
 
 target "login-dev-base" {
@@ -16,9 +13,6 @@ target "login-dev-base" {
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
-  output = ["type=docker"]
-  cache-from = ["type=gha,scope=login-dev-base"]
-  cache-to   = ["type=gha,scope=login-dev-base,ignore-error=true,mode=max"]
 }
 
 variable "LOGIN_LINT_TAG" {
@@ -31,9 +25,6 @@ target "login-lint" {
     login-dev-base = "target:login-dev-base"
   }
   tags = ["${LOGIN_LINT_TAG}"]
-  output = ["type=docker"]
-  cache-from = ["type=gha,scope=login-lint"]
-  cache-to   = ["type=gha,scope=login-lint,ignore-error=true,mode=max"]
 }
 
 variable "LOGIN_TEST_UNIT_TAG" {
@@ -83,10 +74,6 @@ target "core-mock" {
   contexts = {
     protos = "target:proto-files"
   }
-  output = [
-    "type=docker",
-    "type=cacheonly"
-  ]
   tags = ["${CORE_MOCK_TAG}"]
 }
 
@@ -99,10 +86,6 @@ target "login-test-integration" {
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
-  output = [
-    "type=docker",
-    "type=cacheonly"
-  ]
   tags = ["${LOGIN_TEST_INTEGRATION_TAG}"]
 }
 
@@ -115,10 +98,6 @@ target "login-test-acceptance" {
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
-  output = [
-    "type=docker",
-    "type=cacheonly"
-  ]
   tags = ["${LOGIN_TEST_ACCEPTANCE_TAG}"]
 }
 
@@ -133,8 +112,4 @@ target "login-standalone" {
     login-client = "target:login-client"
   }
   tags = ["${LOGIN_TAG}"]
-  output = [
-    "type=docker",
-    "type=cacheonly"
-  ]
 }