This commit is contained in:
Elio Bischof
2025-06-18 12:25:10 +02:00
parent c6c70990f2
commit d2f191b702
2 changed files with 6 additions and 6 deletions

View File

@@ -41,7 +41,7 @@ jobs:
- run: make login-quality - run: make login-quality
env: env:
# latest if branch is main, otherwise image version which is the pull request number # latest if branch is main, otherwise image version which is the pull request number
BUILDX_CLI: depot --file docker-bake.hcl --file docker-bake-ci.hcl BUILDX_CLI: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl
DEPOT_PROJECT_ID: jp837jn3fm DEPOT_PROJECT_ID: jp837jn3fm
REF_TAG: ${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} 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 CACHE_DIR: ${{ runner.temp }}/zitadel-make-cache

View File

@@ -34,13 +34,13 @@ login-help:
@echo " clean-cache-keys - Remove all cache keys." @echo " clean-cache-keys - Remove all cache keys."
login-lint: login-lint:
$(BUILDX_CLI) bake login-lint $(BAKE_CLI) login-lint
login-test-unit: login-test-unit:
$(BUILDX_CLI) bake login-test-unit $(BAKE_CLI) login-test-unit
login-test-integration-build: login-test-integration-build:
$(BUILDX_CLI) bake core-mock login-test-integration $(BAKE_CLI) core-mock login-test-integration
login-test-integration-run: login-test-integration-cleanup login-test-integration-run: login-test-integration-cleanup
docker compose --file ./apps/login-test-integration/docker-compose.yaml run --rm integration docker compose --file ./apps/login-test-integration/docker-compose.yaml run --rm integration
@@ -56,7 +56,7 @@ login-test-integration: login-standalone-build login-test-integration-build
$(LOGIN_TEST_INTEGRATION_TAG)" $(LOGIN_TEST_INTEGRATION_TAG)"
login-test-acceptance-build: login-test-acceptance-build:
$(BUILDX_CLI) --file ./apps/login-test-acceptance/docker-compose.yaml bake setup sink oidcop samlsp samlidp login-standalone login-test-acceptance $(BAKE_CLI) --file ./apps/login-test-acceptance/docker-compose.yaml setup sink oidcop samlsp samlidp login-standalone login-test-acceptance
login-test-acceptance-run: login-acceptance-cleanup login-test-acceptance-run: login-acceptance-cleanup
docker compose --file ./apps/login-test-acceptance/docker-compose.yaml run --rm --service-ports acceptance docker compose --file ./apps/login-test-acceptance/docker-compose.yaml run --rm --service-ports acceptance
@@ -84,7 +84,7 @@ login-quality: login-lint login-test-unit login-test-integration login-test-acce
.PHONY: login-standalone-build .PHONY: login-standalone-build
login-standalone-build: login-standalone-build:
$(BUILDX_CLI) bake login-standalone $(BAKE_CLI) bake login-standalone
.PHONY: clean-cache-keys .PHONY: clean-cache-keys
clean-cache-keys: clean-cache-keys: