This commit is contained in:
Elio Bischof
2025-06-18 18:05:25 +02:00
parent 71de48e7bc
commit 8a414c33c0
3 changed files with 13 additions and 10 deletions

View File

@@ -24,6 +24,7 @@ public/dist
Makefile Makefile
docker-bake.hcl docker-bake.hcl
docker-bake-ci.hcl
*.md *.md
.gitignore .gitignore
_temp _temp

View File

@@ -33,25 +33,27 @@ jobs:
- uses: depot/setup-action@v1 - uses: depot/setup-action@v1
with: with:
oidc: true 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 - name: Restore Run Caches
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
id: run-caches-restore id: run-caches-restore
with: with:
path: ${{ runner.temp }}/zitadel-make-cache path: ${{ runner.temp }}/login-make-cache
key: zitadel-make-cache-${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} key: login-make-cache-${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
restore-keys: zitadel-make-cache-latest restore-keys: login-make-cache-latest
- 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
BAKE_CLI: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl BAKE_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 }}/login-make-cache
LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT: "./" LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT: "."
- name: Save Run Caches - name: Save Run Caches
id: cache-primes-save
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: ${{ runner.temp }}/zitadel-make-cache path: ${{ runner.temp }}/login-make-cache
key: ${{ steps.run-caches-restore.outputs.cache-primary-key }} key: ${{ steps.run-caches-restore.outputs.cache-primary-key }}
if: always() if: always()

View File

@@ -35,13 +35,13 @@ login-help:
@echo " clean-cache-keys - Remove all cache keys." @echo " clean-cache-keys - Remove all cache keys."
login-lint: login-lint:
$(BAKE_CLI) login-lint $(BAKE_CLI) login-lint --print && $(BAKE_CLI) login-lint
login-test-unit: login-test-unit:
$(BAKE_CLI) login-test-unit $(BAKE_CLI) login-test-unit --print && $(BAKE_CLI) login-test-unit
login-test-integration-build: 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 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