ci: update ci workflow

Author: mato533

.github/workflows/ci-e2e.yml

@@ -47,6 +47,9 @@ jobs:
         with:
           path: e2e/.wdio-vscode-service
 
+      - name: 🖥️ Set screen resolution
+        uses: ./.github/workflows/actions/set-screen-resolution
+
       - name: 🧪 Run the e2e test
         env:
           E2E_SCENARIO: ${{ matrix.scenario }}

.github/workflows/ci-smoke.yml

@@ -4,6 +4,10 @@ on:
   workflow_call:
     # Make this a reusable workflow, no value needed
     # https://docs.github.com/en/actions/using-workflows/reusing-workflows
+    inputs:
+      scenario:
+        description: 'Smoke scenario'
+        type: string
 
 env:
   TURBO_TELEMETRY_DISABLED: 1
@@ -40,16 +44,21 @@ jobs:
         with:
           path: e2e/.wdio-vscode-service
 
+      - name: 🖥️ Set screen resolution
+        uses: ./.github/workflows/actions/set-screen-resolution
+
       - name: 🚂 Run the smoke test
-        run: pnpm run test:smoke
+        env:
+          E2E_SCENARIO: ${{ inputs.scenario }}
+        run: pnpm --filter @vscode-wdio/e2e run test:smoke:${E2E_SCENARIO}
         shell: bash
 
       - name: 📦 Upload Test Logs on Failure
         uses: ./.github/workflows/actions/upload-archive
         if: failure()
         with:
-          name: smoke-logs-${{ matrix.os }}
-          output: smoke-logs-${{ matrix.os }}.zip
+          name: smoke-${{ inputs.scenario }}--logs-${{ matrix.os }}
+          output: smoke-${{ inputs.scenario }}-logs-${{ matrix.os }}.zip
           paths: e2e/logs
 
       - name: 🐛 Debug Build

.github/workflows/ci.yml

@@ -46,7 +46,16 @@ jobs:
     with:
       compatibility-mode: 'yes'
 
-  smoke:
-    name: Smoke
-    needs: [lint, build, e2e, compatibility]
+  smoke-config:
+    name: Smoke - Update Config
+    needs: [lint, build, e2e]
     uses: ./.github/workflows/ci-smoke.yml
+    with:
+      scenario: 'config'
+
+  smoke-timeout:
+    name: Smoke - Worker idle timeout
+    needs: [lint, build, e2e]
+    uses: ./.github/workflows/ci-smoke.yml
+    with:
+      scenario: 'timeout'

e2e/package.json

@@ -17,7 +17,7 @@
     "test:e2e:basic:cucumber": "cross-env VSCODE_WDIO_E2E_SCENARIO=cucumber xvfb-maybe pnpm run wdio",
     "test:e2e:workspace": "cross-env VSCODE_WDIO_E2E_SCENARIO=workspace xvfb-maybe pnpm run wdio",
     "test:smoke": "run-s test:smoke:*",
-    "test:smoke:update-config": "cross-env VSCODE_WDIO_E2E_SCENARIO=config xvfb-maybe wdio run ./wdioSmoke.conf.ts",
+    "test:smoke:config": "cross-env VSCODE_WDIO_E2E_SCENARIO=config xvfb-maybe wdio run ./wdioSmoke.conf.ts",
     "test:smoke:timeout": "cross-env VSCODE_WDIO_E2E_SCENARIO=timeout xvfb-maybe wdio run ./wdioSmoke.conf.ts",
     "wdio": "wdio run ./wdio.conf.ts"
   },