ci: separate workspace and basic scenario

Author: mato533

.github/workflows/ci-e2e.yml

@@ -15,13 +15,14 @@ env:
   VSCODE_WDIO_E2E_COMPATIBILITY_MODE: ${{ inputs.compatibility-mode }}
 
 jobs:
-  unit:
-    name: E2E Tests (${{ matrix.os }}.${{ matrix.node-version }})
+  e2e:
+    name: E2E Tests - ${{ matrix.scenario }} (${{ matrix.os }}.${{ matrix.node-version }})
     strategy:
       fail-fast: false
       matrix:
         node-version: ['20']
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+        scenario: ['basic', 'workspace']
     runs-on: ${{ matrix.os }}
     steps:
       - name: 👷 Checkout
@@ -47,15 +48,17 @@ jobs:
           path: e2e/.wdio-vscode-service
 
       - name: 🧪 Run the e2e test
-        run: pnpm run test:e2e
+        env:
+          E2E_SCENARIO: ${{ matrix.scenario }}
+        run: pnpm --filter @vscode-wdio/e2e run test:e2e:${E2E_SCENARIO}
         shell: bash
 
       - name: 📦 Upload Test Logs on Failure
         uses: ./.github/workflows/actions/upload-archive
         if: failure()
         with:
-          name: ${{ inputs.compatibility-mode == 'yes' && 'compatibility' || 'e2e' }}-logs-${{ matrix.os }}
-          output: ${{ inputs.compatibility-mode == 'yes' && 'compatibility' || 'e2e' }}-logs-${{ matrix.os }}.zip
+          name: ${{ inputs.compatibility-mode == 'yes' && 'compatibility' || 'e2e' }}-${{ matrix.scenario }}-logs-${{ matrix.os }}
+          output: ${{ inputs.compatibility-mode == 'yes' && 'compatibility' || 'e2e' }}-${{ matrix.scenario }}-logs-${{ matrix.os }}.zip
           paths: e2e/logs
 
       - name: 🐛 Debug Build

.github/workflows/ci-smoke.yml

@@ -9,7 +9,7 @@ env:
   TURBO_TELEMETRY_DISABLED: 1
 
 jobs:
-  unit:
+  smoke:
     name: Smoke Tests (${{ matrix.os }}.${{ matrix.node-version }})
     strategy:
       fail-fast: false

e2e/package.json

@@ -10,10 +10,11 @@
     }
   },
   "scripts": {
-    "test:e2e": "run-s test:e2e:*",
-    "test:e2e:mocha": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=mocha xvfb-maybe pnpm run wdio",
-    "test:e2e:jasmine": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=jasmine xvfb-maybe pnpm run wdio",
-    "test:e2e:cucumber": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=cucumber xvfb-maybe pnpm run wdio",
+    "test:e2e": "run-s test:e2e:basic test:e2e:workspace",
+    "test:e2e:basic": "run-s test:e2e:basic:*",
+    "test:e2e:basic:mocha": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=mocha xvfb-maybe pnpm run wdio",
+    "test:e2e:basic:jasmine": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=jasmine xvfb-maybe pnpm run wdio",
+    "test:e2e:basic:cucumber": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=cucumber xvfb-maybe pnpm run wdio",
     "test:e2e:workspace": "cross-env VSCODE_WDIO_E2E_FRAMEWORK=workspace xvfb-maybe pnpm run wdio",
     "test:smoke": "run-s test:smoke:*",
     "test:smoke:update-config": "xvfb-maybe wdio run ./wdioSmoke.conf.ts",