From 8a414c33c0d2e401c05343c78757ed29510b6034 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Wed, 18 Jun 2025 18:05:25 +0200
Subject: [PATCH] debug

---
 .dockerignore              |  1 +
 .github/workflows/test.yml | 16 +++++++++-------
 Makefile                   |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1b52da1f33..760ee9196c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -24,6 +24,7 @@ public/dist
 
 Makefile
 docker-bake.hcl
+docker-bake-ci.hcl
 *.md
 .gitignore
 _temp
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b29b081f5..6aa72a8e5d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,25 +33,27 @@ jobs:
       - uses: depot/setup-action@v1
         with:
           oidc: true
+      - run: docker buildx bake --file docker-bake.hcl --file docker-bake-ci.hcl --file ./apps/login-test-acceptance/docker-compose.yaml setup sink oidcrp oidcop samlsp samlidp login-test-acceptance
+      - run: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl --file ./apps/login-test-acceptance/docker-compose.yaml setup sink oidcrp oidcop samlsp samlidp login-test-acceptance
+      - run: docker compose --file ./apps/login-test-acceptance/docker-compose.yaml build
       - name: Restore Run Caches
         uses: actions/cache/restore@v4
         id: run-caches-restore
         with:
-          path: ${{ runner.temp }}/zitadel-make-cache
-          key: zitadel-make-cache-${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-          restore-keys: zitadel-make-cache-latest
+          path: ${{ runner.temp }}/login-make-cache
+          key: login-make-cache-${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          restore-keys: login-make-cache-latest
       - run: make login-quality
         env:
           # latest if branch is main, otherwise image version which is the pull request number
           BAKE_CLI: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl
           DEPOT_PROJECT_ID: jp837jn3fm
           REF_TAG: ${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-          CACHE_DIR: ${{ runner.temp }}/zitadel-make-cache
-          LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT: "./"
+          CACHE_DIR: ${{ runner.temp }}/login-make-cache
+          LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT: "."
       - name: Save Run Caches
-        id: cache-primes-save
         uses: actions/cache/save@v4
         with:
-          path: ${{ runner.temp }}/zitadel-make-cache
+          path: ${{ runner.temp }}/login-make-cache
           key: ${{ steps.run-caches-restore.outputs.cache-primary-key }}
         if: always()
diff --git a/Makefile b/Makefile
index bb2ff9e68f..89479bb463 100644
--- a/Makefile
+++ b/Makefile
@@ -35,13 +35,13 @@ login-help:
 	@echo "  clean-cache-keys        - Remove all cache keys."
 
 login-lint:
-	$(BAKE_CLI) login-lint
+	$(BAKE_CLI) login-lint --print && $(BAKE_CLI) login-lint
 
 login-test-unit:
-	$(BAKE_CLI) login-test-unit
+	$(BAKE_CLI) login-test-unit --print && $(BAKE_CLI) login-test-unit
 
 login-test-integration-build:
-	$(BAKE_CLI) core-mock login-test-integration
+	$(BAKE_CLI) core-mock login-test-integration --print && $(BAKE_CLI) core-mock login-test-integration
 
 login-test-integration-run: login-test-integration-cleanup
 	docker compose --file ./apps/login-test-integration/docker-compose.yaml run --rm integration