chore: always run tests for coverage

This commit is contained in:
Stefan Benz
2025-07-09 16:30:29 +02:00
parent cc7af908a8
commit 287a21d902
2 changed files with 7 additions and 5 deletions

View File

@@ -111,6 +111,7 @@ jobs:
- -
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
pattern: zitadel-*
path: executables path: executables
- -
name: move files one folder up name: move files one folder up

View File

@@ -7,11 +7,12 @@ VERSION ?= development-$(now)
COMMIT_SHA ?= $(shell git rev-parse HEAD) COMMIT_SHA ?= $(shell git rev-parse HEAD)
ZITADEL_IMAGE ?= zitadel:local ZITADEL_IMAGE ?= zitadel:local
GOCOVERDIR = "$(shell pwd)/tmp/coverage/integration" GOCOVERDIR = tmp/coverage/integration
GOCOVERDIR_INTEGRATION = "$(shell pwd)/${GOCOVERDIR}"
GOCOVERDIR_UNIT = "$(shell pwd)/tmp/coverage/unit" GOCOVERDIR_UNIT = "$(shell pwd)/tmp/coverage/unit"
ZITADEL_MASTERKEY ?= MasterkeyNeedsToHave32Characters ZITADEL_MASTERKEY ?= MasterkeyNeedsToHave32Characters
export GOCOVERDIR GOCOVERDIR_UNIT ZITADEL_MASTERKEY export GOCOVERDIR GOCOVERDIR_INTEGRATION GOCOVERDIR_UNIT ZITADEL_MASTERKEY
LOGIN_REMOTE_NAME := login LOGIN_REMOTE_NAME := login
LOGIN_REMOTE_URL ?= https://github.com/zitadel/typescript.git LOGIN_REMOTE_URL ?= https://github.com/zitadel/typescript.git
@@ -137,7 +138,7 @@ core_integration_db_down:
.PHONY: core_integration_setup .PHONY: core_integration_setup
core_integration_setup: core_integration_setup:
mkdir -p ${GOCOVERDIR} mkdir -p ${GOCOVERDIR_INTEGRATION}
go build -cover -race -tags integration -o zitadel.test main.go go build -cover -race -tags integration -o zitadel.test main.go
GORACE="halt_on_error=1" ./zitadel.test init --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml GORACE="halt_on_error=1" ./zitadel.test init --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml
GORACE="halt_on_error=1" ./zitadel.test setup --masterkeyFromEnv --init-projections --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml --steps internal/integration/config/steps.yaml GORACE="halt_on_error=1" ./zitadel.test setup --masterkeyFromEnv --init-projections --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml --steps internal/integration/config/steps.yaml
@@ -165,14 +166,14 @@ core_integration_server_stop:
.PHONY: core_integration_reports .PHONY: core_integration_reports
core_integration_reports: core_integration_reports:
go tool covdata textfmt -i=${GOCOVERDIR} -pkg=github.com/zitadel/zitadel/internal/...,github.com/zitadel/zitadel/cmd/... -o integration-profile.cov go tool covdata textfmt -i=${GOCOVERDIR_INTEGRATION} -pkg=github.com/zitadel/zitadel/internal/...,github.com/zitadel/zitadel/cmd/... -o integration-profile.cov
.PHONY: core_integration_test .PHONY: core_integration_test
core_integration_test: core_integration_server_start core_integration_test_packages core_integration_server_stop core_integration_test: core_integration_server_start core_integration_test_packages core_integration_server_stop
.PHONY: core_coverage_reports .PHONY: core_coverage_reports
core_coverage_reports: core_coverage_reports:
go tool covdata textfmt -i=${GOCOVERDIR},${GOCOVERDIR_UNIT} -pkg=github.com/zitadel/zitadel/internal/...,github.com/zitadel/zitadel/cmd/... -o full-profile.cov go tool covdata textfmt -i=${GOCOVERDIR_INTEGRATION},${GOCOVERDIR_UNIT} -pkg=github.com/zitadel/zitadel/internal/...,github.com/zitadel/zitadel/cmd/... -o full-profile.cov
.PHONY: console_lint .PHONY: console_lint
console_lint: console_lint: