warning: this commit will be force pushed

bukowa · Jun 29, 2024 · 0363ac7 · 0363ac7
1 parent e1dccac
commit 0363ac7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -59,6 +59,27 @@ jobs:
         run: |
           . <(just prerequisites)
 
+      - name: Install Prerequisites
+        if: ${{ inputs.os == 'windows-latest' }}
+        shell: "powershell"
+        # https://github.com/actions/runner-images/issues/9538
+        # https://github.com/microsoft/playwright/pull/30009/files
+        # https://github.com/tauri-apps/wry/issues/1268
+        # Evergreen Bootstrapper
+        # The Bootstrapper is a tiny installer that downloads
+        # the Evergreen Runtime matching device architecture
+        # and installs it locally.
+        # https://developer.microsoft.com/en-us/microsoft-edge/webview2/consumer/?form=MA13LH
+        run: |
+          Invoke-WebRequest -Uri 'https://go.microsoft.com/fwlink/p/?LinkId=2124703' -OutFile 'setup.exe'
+          Start-Process -FilePath setup.exe -Verb RunAs -Wait
+
+      - name: Install Prerequisites
+        if: ${{ inputs.os == 'macos-latest' }}
+        shell: "bash"
+        run: |
+          echo "macOS - Install Prerequisites"
+
       - name: Linux - Run UI E2E tests
         if: ${{ inputs.os == 'ubuntu-latest' }}
         shell: "bash"
@@ -67,7 +88,10 @@ jobs:
       - name: Windows - Run UI E2E tests
         if: ${{ inputs.os == 'windows-latest' }}
         shell: "bash"
-        run: just test-e2e
+        run: |
+          just browser-version-pending-update
+          just browser-version
+          just test-e2e
 
       - name: MacOS - Run UI E2E tests
         if: ${{ inputs.os == 'macos-latest' }}

diff --git a/.github/workflows/tests-macos.yaml b/.github/workflows/tests-macos.yaml
@@ -3,11 +3,13 @@ name: "macOS Tests"
 on:
   workflow_call:
   workflow_dispatch:
-  schedule:
-    - cron: "20 04 * * *"
-  push:
-    branches:
-      - master
+
+#  schedule:
+#    - cron: "20 04 * * *"
+#  push:
+#    branches:
+#      - master
+
 jobs:
 
   macos-e2e:

diff --git a/tests-e2e-js/src/main.ts b/tests-e2e-js/src/main.ts
@@ -68,6 +68,9 @@ describe("Tauri E2E tests", async () => {
             driverProcess.kill()
         })
 
+        // sleep for 10 seconds to allow the driver to start
+        await new Promise((resolve) => setTimeout(resolve, 10000));
+
         logger.info("Creating driver with", {capabilities: capabilities})
         driver = await new Builder()
             .withCapabilities(capabilities)