From 3c935ed56e5a49333c1848479d4f7838121a97a8 Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Tue, 17 Mar 2026 16:30:45 -0500 Subject: [PATCH] e2e-workflow-separate (#67) Reviewed-on: https://git.mcintire.me/graham/towerops-web/pulls/67 --- .forgejo/workflows/e2e-tests.yaml | 4 ++-- .forgejo/workflows/staging.yaml | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/e2e-tests.yaml b/.forgejo/workflows/e2e-tests.yaml index 877de515..68b51a1c 100644 --- a/.forgejo/workflows/e2e-tests.yaml +++ b/.forgejo/workflows/e2e-tests.yaml @@ -140,9 +140,9 @@ jobs: working-directory: e2e run: | if [ "${{ inputs.browser }}" = "all" ]; then - npm test + npm test -- --workers=10 else - npm test -- --project=${{ inputs.browser }} + npm test -- --workers=10 --project=${{ inputs.browser }} fi env: CI: true diff --git a/.forgejo/workflows/staging.yaml b/.forgejo/workflows/staging.yaml index 3afb7e9e..1e7a0020 100644 --- a/.forgejo/workflows/staging.yaml +++ b/.forgejo/workflows/staging.yaml @@ -32,8 +32,9 @@ jobs: ssh-keyscan -H 204.110.191.231 >> ~/.ssh/known_hosts # Clear stale deploy lock from cancelled runs ssh dokku@204.110.191.231 apps:unlock towerops || true - git remote add dokku dokku@204.110.191.231:towerops || true - git fetch dokku || true - # Deploy the PR branch to staging - git push dokku HEAD:main --force + # Remove existing remote and re-add to ensure clean state + git remote remove dokku 2>/dev/null || true + git remote add dokku dokku@204.110.191.231:towerops + # Deploy the PR branch to staging (force push to override any conflicts) + git push dokku HEAD:refs/heads/main --force