From 27c657ebc4b0c875a73cf6dbd094d2b6061b6928 Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Mon, 8 Apr 2024 15:14:03 +0200
Subject: [PATCH] tweak

---
 .github/workflows/ci-e2e.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml
index 365e39cee..8517b633b 100644
--- a/.github/workflows/ci-e2e.yml
+++ b/.github/workflows/ci-e2e.yml
@@ -2,6 +2,10 @@ name: "CI-E2E"
 
 on: [push, pull_request]
 
+defaults:
+  run:
+    working-directory: ./e2e
+
 jobs:
   e2e:
     runs-on: ubuntu-latest
@@ -21,20 +25,22 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: npm
       - run: npm ci
-      - run: |
+        working-directory: ./
+      - name: Build Server
+        run: |
           docker compose up -d
+      - name: Build Client
+        run:
           npm install
           npm run build
           python -m http.server -d dist 9000 &
-        working-directory: ./e2e
-      - run: ./scripts/ci-wait-for-services.sh
+      - run: ./ci-wait-for-services.sh
+        working-directory: scripts
       - name: E2E Suite A
         if: matrix.e2e == 'a'
-        working-directory: ./e2e
         run: npm run cypress-ci -- --spec "cypress/e2e/events/*.cy.ts"
       - name: E2E Suite B
         if: matrix.e2e == 'b'
-        working-directory: ./e2e
         run: npm run cypress-ci -- --spec "cypress/e2e/!(events)/*.cy.ts|cypress/e2e/workqueue.cy.ts"
       - name: Upload screenshots
         if: ${{ failure() }}