From 21084af22fdfa8476dc32c46bf6436b4ad8fd435 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 17 Feb 2025 11:01:58 +0000
Subject: [PATCH] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_and_test.yaml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index 4ffa34ed..d234dbf7 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -86,29 +86,31 @@ jobs:
                     - name: Windows (x86) Squirrel
                       os: windows-2022
                       artifact: win-ia32
-                      executable: "$LOCALAPPDATA/element-desktop/Element.exe"
-                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Start-Sleep -Seconds 30'
+                      executable: "$LOCALAPPDATA/element-desktop/app-*/Element.exe"
+                      prepare_cmd: |
+                          . "./dist/squirrel-windows*/Element Setup*.exe"
+                          Start-Sleep -Seconds 30
                     - name: Windows (x86) MSI
                       os: windows-2022
                       artifact: win-ia32
                       executable: "C:/Program Files (x86)/Element/Element.exe"
                       prepare_cmd: |
                           $file = Get-Item ./dist/*.msi | Select -First 1 -ExpandProperty FullName
-                          $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
-                          $procMain.WaitForExit()
+                          Start-Process $file -ArgumentList '/quiet' -Wait
                     - name: Windows (x64) Squirrel
                       os: windows-2022
                       artifact: win-x64
-                      executable: "$LOCALAPPDATA/element-desktop/Element.exe"
-                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Wait-Process -Name setup'
+                      executable: "$LOCALAPPDATA/element-desktop/app-*/Element.exe"
+                      prepare_cmd: |
+                          . "./dist/squirrel-windows*/Element Setup*.exe"
+                          Start-Sleep -Seconds 30
                     - name: Windows (x64) MSI
                       os: windows-2022
                       artifact: win-x64
                       executable: "C:/Program Files/Element/Element.exe"
                       prepare_cmd: |
                           $file = Get-Item ./dist/*.msi | Select -First 1 -ExpandProperty FullName
-                          $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
-                          $procMain.WaitForExit()
+                          Start-Process $file -ArgumentList '/quiet' -Wait
         name: Test ${{ matrix.name }}
         runs-on: ${{ matrix.os }}
         steps: