From 1f506e7c9ee84670bf8c014bfb8d9323bc86fdc4 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 20 Jun 2025 11:14:25 +0200 Subject: [PATCH] image created --- .github/workflows/test.yml | 5 ++--- Makefile | 14 ++++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 906343794c..1da6a6d2b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,13 +59,12 @@ jobs: ${{ runner.os }}-login-run-caches- - name: Show Run Caches run: make show-run-caches - - run: make login-test-acceptance + - run: make login-quality env: # latest if branch is main, otherwise image version which is the pull request number BAKE_CLI: depot bake DEPOT_PROJECT_ID: jp837jn3fm - FORCE: true -# FORCE: ${{ github.event.inputs.clean-run-caches == 'true' }} + FORCE: ${{ github.event.inputs.clean-run-caches == 'true' }} - name: Save Run Caches uses: actions/cache/save@v4 with: diff --git a/Makefile b/Makefile index 3abf89e433..6977557c2c 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ login-test-unit: $(BAKE_CLI_WITH_COMMON_ARGS) login-test-unit login-test-integration-build: - $(BAKE_CLI_WITH_COMMON_ARGS) core-mock login-test-integration + $(BAKE_CLI_WITH_COMMON_ARGS) core-mock login-test-integration login-standalone login-test-integration-run: login-test-integration-cleanup docker compose --file ./apps/login-test-integration/docker-compose.yaml run --rm integration @@ -54,20 +54,14 @@ login-test-integration-cleanup: docker compose --file ./apps/login-test-integration/docker-compose.yaml down --volumes .PHONY: login-test-integration -login-test-integration: login-standalone-build login-test-integration-build +login-test-integration: login-test-integration-build ./scripts/run_or_skip.sh login-test-integration-run \ "$(LOGIN_TAG) \ $(CORE_MOCK_TAG) \ $(LOGIN_TEST_INTEGRATION_TAG)" -login-test-acceptance-compose-build: - $(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink oidcrp samlsp - -login-test-acceptance-bake-build: - $(BAKE_CLI_WITH_COMMON_ARGS) login-test-acceptance - -login-test-acceptance-build: login-test-acceptance-compose-build login-test-acceptance-bake-build login-standalone-build - @: +login-test-acceptance-build: + $(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink oidcrp samlsp login-test-acceptance login-standalone login-test-acceptance-run: login-test-acceptance-cleanup docker compose --file ./apps/login-test-acceptance/docker-compose.yaml run --rm --service-ports acceptance