rm tailwind package, fix e2e workflows

This commit is contained in:
Max Peintner
2025-07-14 09:45:25 +02:00
parent 80b4bd60a8
commit 60fa62779d
5 changed files with 56 additions and 30 deletions

View File

@@ -12,44 +12,45 @@ jobs:
browser: [firefox, chrome] browser: [firefox, chrome]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- - name: Checkout Repository
name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- - uses: actions/download-artifact@v4
uses: actions/download-artifact@v4
with: with:
path: .artifacts path: .artifacts
name: zitadel-linux-amd64 name: zitadel-linux-amd64
- - name: Unpack executable
name: Unpack executable
run: | run: |
tar -xvf .artifacts/zitadel-linux-amd64.tar.gz tar -xvf .artifacts/zitadel-linux-amd64.tar.gz
mv zitadel-linux-amd64/zitadel ./zitadel mv zitadel-linux-amd64/zitadel ./zitadel
- - name: Set up QEMU
name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
- - name: Set up Docker Buildx
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- - uses: pnpm/action-setup@v4
name: Start DB and ZITADEL - uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
cache-dependency-path: pnpm-lock.yaml
- name: Install dependencies
run: pnpm install
- name: Start DB and ZITADEL
run: | run: |
cd ./e2e cd ./e2e
ZITADEL_IMAGE=zitadel:local docker compose up --detach --wait ZITADEL_IMAGE=zitadel:local docker compose up --detach --wait
- - name: Cypress run
name: Cypress run
uses: cypress-io/github-action@v6 uses: cypress-io/github-action@v6
env: env:
CYPRESS_BASE_URL: http://localhost:8080/ui/console CYPRESS_BASE_URL: http://localhost:8080/ui/console
CYPRESS_WEBHOOK_HANDLER_HOST: host.docker.internal CYPRESS_WEBHOOK_HANDLER_HOST: host.docker.internal
CYPRESS_DATABASE_CONNECTION_URL: 'postgresql://root@localhost:26257/zitadel' CYPRESS_DATABASE_CONNECTION_URL: "postgresql://root@localhost:26257/zitadel"
CYPRESS_BACKEND_URL: http://localhost:8080 CYPRESS_BACKEND_URL: http://localhost:8080
with: with:
working-directory: e2e working-directory: e2e
browser: ${{ matrix.browser }} browser: ${{ matrix.browser }}
config-file: cypress.config.ts config-file: cypress.config.ts
- install: false
uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
if: always() if: always()
with: with:
name: production-tests-${{ matrix.browser }} name: production-tests-${{ matrix.browser }}

View File

@@ -2,16 +2,16 @@
"name": "zitadel-e2e", "name": "zitadel-e2e",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"open": "npx cypress open", "open": "pnpm exec cypress open",
"e2e": "npx cypress run", "e2e": "pnpm exec cypress run",
"open:golang": "npm run open --", "open:golang": "pnpm run open --",
"e2e:golang": "npm run e2e --", "e2e:golang": "pnpm run e2e --",
"open:golangangular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 npm run open --", "open:golangangular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 pnpm run open --",
"e2e:golangangular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 npm run e2e --", "e2e:golangangular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 pnpm run e2e --",
"open:angulargolang": "npm run open:golangangular --", "open:angulargolang": "pnpm run open:golangangular --",
"e2e:angulargolang": "npm run e2e:golangangular --", "e2e:angulargolang": "pnpm run e2e:golangangular --",
"open:angular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 CYPRESS_WEBHOOK_HANDLER_HOST=host.docker.internal npm run open --", "open:angular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 CYPRESS_WEBHOOK_HANDLER_HOST=host.docker.internal pnpm run open --",
"e2e:angular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 CYPRESS_WEBHOOK_HANDLER_HOST=host.docker.internal npm run e2e --", "e2e:angular": "CYPRESS_BASE_URL=http://localhost:4200 CYPRESS_BACKEND_URL=http://localhost:8080 CYPRESS_WEBHOOK_HANDLER_HOST=host.docker.internal pnpm run e2e --",
"lint": "prettier --check cypress", "lint": "prettier --check cypress",
"lint:fix": "prettier --write cypress" "lint:fix": "prettier --write cypress"
}, },

25
e2e/turbo.json Normal file
View File

@@ -0,0 +1,25 @@
{
"$schema": "https://turbo.build/schema.json",
"extends": ["//"],
"tasks": {
"e2e": {
"cache": false,
"persistent": false
},
"e2e:golang": {
"cache": false,
"persistent": false
},
"e2e:golangangular": {
"cache": false,
"persistent": false
},
"e2e:angular": {
"cache": false,
"persistent": false
},
"lint": {
"outputs": []
}
}
}

View File

@@ -14,11 +14,11 @@
"outputs": ["dist/**"], "outputs": ["dist/**"],
"dependsOn": ["@zitadel/proto#generate"] "dependsOn": ["@zitadel/proto#generate"]
}, },
"@zitadel/client#build": { "client:build": {
"outputs": ["dist/**"], "outputs": ["dist/**"],
"dependsOn": ["@zitadel/proto#generate"] "dependsOn": ["@zitadel/proto#generate"]
}, },
"@zitadel/proto#generate": { "proto:generate": {
"outputs": ["zitadel/**"], "outputs": ["zitadel/**"],
"cache": false "cache": false
}, },

2
pnpm-lock.yaml generated
View File

@@ -22802,7 +22802,7 @@ snapshots:
copy-webpack-plugin@11.0.0(webpack@5.99.9(@swc/core@1.12.9(@swc/helpers@0.5.17))(esbuild@0.25.5)): copy-webpack-plugin@11.0.0(webpack@5.99.9(@swc/core@1.12.9(@swc/helpers@0.5.17))(esbuild@0.25.5)):
dependencies: dependencies:
fast-glob: 3.3.1 fast-glob: 3.3.3
glob-parent: 6.0.2 glob-parent: 6.0.2
globby: 13.2.2 globby: 13.2.2
normalize-path: 3.0.0 normalize-path: 3.0.0