warning: this commit will be force pushed

bukowa · Jun 29, 2024 · 6b2d12f · 6b2d12f
1 parent d801d49
commit 6b2d12f
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 13 deletions.
diff --git a/.github/workflows/tests-e2e-js.yaml b/.github/workflows/tests-e2e-js.yaml
@@ -2,7 +2,7 @@ name: "Test: UI E2E JS"
 
 on:
   schedule:
-  - cron: "20 04 * * *"
+    - cron: "20 04 * * *"
   push:
     branches:
       - master
@@ -12,16 +12,31 @@ on:
   workflow_call:
   workflow_dispatch:
 
+env:
+  TESTS_LOG_LEVEL: debug
+  # xvfb is slow to start
+  NODE_TEST_TIMEOUT: 90000
+  TRACE: 1
+
 jobs:
 
   test:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    name: "Run UI E2E tests"
-    env:
-      # xvfb is slow to start
-      NODE_TEST_TIMEOUT: 90000
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          #          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+          #            args: '--target aarch64-apple-darwin'
+          #          - platform: 'macos-latest' # for Intel based macs.
+          #            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-latest'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
 
+    timeout-minutes: 15
+    runs-on: ${{ matrix.platform }}
+    name: "Run UI E2E tests"
     steps:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
@@ -51,9 +66,25 @@ jobs:
           cache-directories: |
             .build
 
-      - name: Install Prerequisites
+#      - name: Install Prerequisites
+#        if: matrix.platform == 'ubuntu-latest'
+#        run: |
+#          . <(just prerequisites)
+#
+#      - name: Run UI E2E tests Linux
+#        if: matrix.platform == 'ubuntu-latest'
+#        run: xvfb-run -a just test-e2e
+
+      - name: Install Xming
+        shell: "bash"
+        if: matrix.platform == 'windows-latest'
         run: |
-          . <(just prerequisites)
+          curl -L -o xming.exe \
+          https://kumisystems.dl.sourceforge.net/project/xming/Xming/6.9.0.31/Xming-6-9-0-31-setup.exe?viasf=1
+          ./xming.exe /Verysilent /norestart
+          sleep 10
 
-      - name: Run UI E2E tests
-        run: xvfb-run -a just test-e2e
+      - name: Run UI E2E tests Windows
+        shell: "bash"
+        if: matrix.platform == 'windows-latest'
+        run: just test-e2e
diff --git a/justfile b/justfile
@@ -102,14 +102,25 @@ test-e2e-fast:
       --require ts-node/register \
       tests-e2e-js
 
+
+
 [group('webview')]
-[doc('get microsoftedge version')]
+[doc('get microsoftedge version that is pending update')]
 [windows]
-browser-version:
+browser-version-pending-update:
     REG QUERY \
     "HKLM\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}" \
     | grep pv | awk '{print $3}'
 
+[group('webview')]
+[doc('get microsoftedge version')]
+[windows]
+browser-version:
+    #!/bin/bash
+    wmic datafile where \
+      'name="C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe"' \
+      get version | tail -n2 | xargs
+
 [group('webview')]
 [doc('get the webdriver url')]
 [windows]