TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 19:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache compose tests

Browse Source
This commit is contained in:
Elio Bischof
2025-06-19 09:31:11 +02:00
parent 290e045fd7
commit 2d2aa255d0
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/test.yml vendored
View File

@@ -20,6 +20,7 @@ jobs:
contents: read contents: read
id-token: write id-token: write
packages: write packages: write
actions: write
env: env:
CACHE_DIR: /tmp/login-run-caches CACHE_DIR: /tmp/login-run-caches
steps: steps:
@@ -62,10 +63,10 @@ jobs:
# 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 BAKE_CLI: depot bake
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'] }} DOCKER_METADATA_OUTPUT_VERSION: ${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
- name: Save Run Caches - name: Save Run Caches
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: ${{ env.CACHE_DIR }} path: ${{ env.CACHE_DIR }}
key: ${{ steps.run-caches-restore.outputs.cache-primary-key }} key: ${{ steps.run-caches-restore.outputs.cache-primary-key }}
if: always() if: always() && steps.run-caches-restore.outputs.cache-hit != 'true'

24
Makefile
View File

@@ -8,21 +8,21 @@ export COMPOSE_BAKE=true
export LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT := apps/login-test-acceptance export LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT := apps/login-test-acceptance
export REF_TAG ?= local export DOCKER_METADATA_OUTPUT_VERSION ?= local
export LOGIN_TAG := login:${REF_TAG} export LOGIN_TAG := login:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_UNIT_TAG := login-test-unit:${REF_TAG} export LOGIN_TEST_UNIT_TAG := login-test-unit:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_INTEGRATION_TAG := login-test-integration:${REF_TAG} export LOGIN_TEST_INTEGRATION_TAG := login-test-integration:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_TAG := login-test-acceptance:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_TAG := login-test-acceptance:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_SETUP_TAG := login-test-acceptance-setup:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_SETUP_TAG := login-test-acceptance-setup:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_SINK_TAG := login-test-acceptance-sink:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_SINK_TAG := login-test-acceptance-sink:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_OIDCRP_TAG := login-test-acceptance-oidcrp:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_OIDCRP_TAG := login-test-acceptance-oidcrp:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_OIDCOP_TAG := login-test-acceptance-oidcop:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_OIDCOP_TAG := login-test-acceptance-oidcop:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_SAMLSP_TAG := login-test-acceptance-samlsp:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_SAMLSP_TAG := login-test-acceptance-samlsp:${DOCKER_METADATA_OUTPUT_VERSION}
export LOGIN_TEST_ACCEPTANCE_SAMLIDP_TAG := login-test-acceptance-samlidp:${REF_TAG} export LOGIN_TEST_ACCEPTANCE_SAMLIDP_TAG := login-test-acceptance-samlidp:${DOCKER_METADATA_OUTPUT_VERSION}
export POSTGRES_TAG := postgres:17.0-alpine3.19 export POSTGRES_TAG := postgres:17.0-alpine3.19
export GOLANG_TAG := golang:1.24-alpine export GOLANG_TAG := golang:1.24-alpine
export ZITADEL_TAG ?= ghcr.io/zitadel/zitadel:02617cf17fdde849378c1a6b5254bbfb2745b164 export ZITADEL_TAG ?= ghcr.io/zitadel/zitadel:02617cf17fdde849378c1a6b5254bbfb2745b164
export CORE_MOCK_TAG := core-mock:${REF_TAG} export CORE_MOCK_TAG := core-mock:${DOCKER_METADATA_OUTPUT_VERSION}
.PHONY: login-help .PHONY: login-help
login-help: login-help:

13
docker-bake.hcl
View File

@@ -1,13 +1,3 @@
target "docker-metadata-action" {}
variable "IMAGE_REGISTRY" {
default = "ghcr.io/zitadel"
}
variable "REF_TAG" {
default = "local"
}
target "login-pnpm" { target "login-pnpm" {
dockerfile = "dockerfiles/login-pnpm.Dockerfile" dockerfile = "dockerfiles/login-pnpm.Dockerfile"
} }
@@ -102,8 +92,11 @@ variable "LOGIN_TAG" {
default = "zitadel-login:local" default = "zitadel-login:local"
} }
target "docker-metadata-action" {}
# We run integration and acceptance tests against the next standalone server for docker. # We run integration and acceptance tests against the next standalone server for docker.
target "login-standalone" { target "login-standalone" {
inherits = ["docker-metadata-action"]
dockerfile = "dockerfiles/login-standalone.Dockerfile" dockerfile = "dockerfiles/login-standalone.Dockerfile"
contexts = { contexts = {
login-client = "target:login-client" login-client = "target:login-client"