From 7199593c013afbe6603f9a0bf9d7585eb937bb14 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Sat, 17 Dec 2022 14:00:35 -0400
Subject: [PATCH] Proper MSI fix (#2481)

---
 .circleci/config.yml | 1 -
 scripts/Makefile.ps1 | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4b47ad0..8bc1c0d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -267,7 +267,6 @@ jobs:
           operation: optimize
       - win_make:
           operation: "install-deps"
-      - run: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npm ci
       - check-windows
       - win_make:
           operation: "build"
diff --git a/scripts/Makefile.ps1 b/scripts/Makefile.ps1
index 8eedb1af..721a2e9c 100644
--- a/scripts/Makefile.ps1
+++ b/scripts/Makefile.ps1
@@ -246,6 +246,8 @@ function Install-Deps {
         Print-Info "Refreshing PATH..."
         Refresh-Path
     }
+
+    InstallDeps-Electron
 }
 
 function Install-Wix {
@@ -511,12 +513,15 @@ function Run-BuildId {
     Print-Info "Modified Wix XML"
 }
 
-function Run-BuildElectron {
+function InstallDeps-Electron {
     Print-Info "Installing nodejs/electron dependencies (running npm ci)..."
     npm i -g node-gyp
     node-gyp install
     node-gyp install --devdir="$env:USERPROFILE\.electron-gyp" --target=$(jq -r .devDependencies.electron package.json) --dist-url="https://electronjs.org/headers"
     npm ci
+}
+
+function Run-BuildElectron {
     #npm install --prefix="$(Get-RootDir)" "$(Get-RootDir)"
     Print-Info "Building nodejs/electron code (running npm run build)..."
     npm run build