This commit is contained in:
Elio Bischof
2025-06-20 12:57:39 +02:00
parent 66310a04bc
commit 25f55ef365
8 changed files with 27 additions and 12 deletions

View File

@@ -57,9 +57,25 @@ jobs:
${{ runner.os }}-login-run-caches-${{github.ref_name}}-${{ github.sha }}- ${{ runner.os }}-login-run-caches-${{github.ref_name}}-${{ github.sha }}-
${{ runner.os }}-login-run-caches-${{github.ref_name}}- ${{ runner.os }}-login-run-caches-${{github.ref_name}}-
${{ runner.os }}-login-run-caches- ${{ runner.os }}-login-run-caches-
- name: Show Run Caches - run: make login-lint
run: make show-run-caches env:
- run: make login-quality # latest if branch is main, otherwise image version which is the pull request number
BAKE_CLI: depot bake
DEPOT_PROJECT_ID: jp837jn3fm
FORCE: ${{ github.event.inputs.clean-run-caches == 'true' }}
- run: make login-test-unit
env:
# latest if branch is main, otherwise image version which is the pull request number
BAKE_CLI: depot bake
DEPOT_PROJECT_ID: jp837jn3fm
FORCE: ${{ github.event.inputs.clean-run-caches == 'true' }}
- run: make login-test-integration
env:
# latest if branch is main, otherwise image version which is the pull request number
BAKE_CLI: depot bake
DEPOT_PROJECT_ID: jp837jn3fm
FORCE: ${{ github.event.inputs.clean-run-caches == 'true' }}
- run: make login-test-acceptance
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 BAKE_CLI: depot bake

View File

@@ -87,10 +87,6 @@ login-test-acceptance: login-test-acceptance-build
$(LOGIN_TEST_ACCEPTANCE_OIDCRP_TAG) \ $(LOGIN_TEST_ACCEPTANCE_OIDCRP_TAG) \
$(LOGIN_TEST_ACCEPTANCE_SAMLSP_TAG)" $(LOGIN_TEST_ACCEPTANCE_SAMLSP_TAG)"
.PHONY: login-quality
login-quality: login-lint login-test-integration login-test-acceptance
@:
.PHONY: login-standalone-build .PHONY: login-standalone-build
login-standalone-build: login-standalone-build:
$(BAKE_CLI_WITH_COMMON_ARGS) login-standalone $(BAKE_CLI_WITH_COMMON_ARGS) login-standalone

View File

@@ -5,7 +5,6 @@
"scripts": { "scripts": {
"dev": "pnpm exec next dev --turbopack", "dev": "pnpm exec next dev --turbopack",
"test:unit": "pnpm exec vitest", "test:unit": "pnpm exec vitest",
"test:unit:standalone": "pnpm test:unit",
"test:unit:watch": "pnpm test:unit --watch", "test:unit:watch": "pnpm test:unit --watch",
"lint": "pnpm exec next lint && pnpm exec prettier --check .", "lint": "pnpm exec next lint && pnpm exec prettier --check .",
"lint:fix": "pnpm exec prettier --write .", "lint:fix": "pnpm exec prettier --write .",

View File

@@ -14,7 +14,6 @@
"test:unit": { "test:unit": {
"dependsOn": ["@zitadel/client#build"] "dependsOn": ["@zitadel/client#build"]
}, },
"test:unit:standalone": {},
"test:watch": { "test:watch": {
"dependsOn": ["@zitadel/client#build"] "dependsOn": ["@zitadel/client#build"]
} }

View File

@@ -4,6 +4,7 @@ COPY packages/zitadel-tsconfig packages/zitadel-tsconfig
COPY packages/zitadel-prettier-config packages/zitadel-prettier-config COPY packages/zitadel-prettier-config packages/zitadel-prettier-config
COPY packages/zitadel-eslint-config packages/zitadel-eslint-config COPY packages/zitadel-eslint-config packages/zitadel-eslint-config
COPY apps/login/package.json apps/login/ COPY apps/login/package.json apps/login/
RUN pnpm install --frozen-lockfile --prefer-offline --workspace-root --filter zitadel-login RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile --workspace-root --filter apps/login
COPY apps/login apps/login COPY apps/login apps/login
RUN pnpm lint && pnpm format --check RUN pnpm lint && pnpm format --check

View File

@@ -2,7 +2,6 @@ FROM login-pnpm AS login-test-integration-dependencies
COPY ./apps/login-test-integration/package.json ./apps/login-test-integration/package.json COPY ./apps/login-test-integration/package.json ./apps/login-test-integration/package.json
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile --filter=login-test-integration pnpm install --frozen-lockfile --filter=login-test-integration
FROM cypress/factory:5.10.0 AS login-test-integration FROM cypress/factory:5.10.0 AS login-test-integration
WORKDIR /opt/app WORKDIR /opt/app
COPY --from=login-test-integration-dependencies /build/apps/login-test-integration . COPY --from=login-test-integration-dependencies /build/apps/login-test-integration .

View File

@@ -3,4 +3,4 @@ COPY apps/login/package.json ./apps/login/
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile --workspace-root --filter ./apps/login pnpm install --frozen-lockfile --workspace-root --filter ./apps/login
COPY apps/login ./apps/login COPY apps/login ./apps/login
RUN pnpm test:unit:standalone RUN cd apps/login && pnpm test:unit

View File

@@ -4,3 +4,8 @@
!/apps/login/locales !/apps/login/locales
!/apps/login/constants !/apps/login/constants
!/apps/login/*.json !/apps/login/*.json
!/apps/login/*.mjs
!/apps/login/*.mts
!/apps/login/*.d.ts
!/packages/zitadel-tailwind-config/package.json
!/packages/zitadel-tailwind-config/tailwind.config.mjs