From e49d317d1977a6ce454f55ab1c4f225bb6e47beb Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:47:02 -0400
Subject: [PATCH] Remove safari build script from Build workflow (#1413)

---
 .github/workflows/build.yml | 39 ++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69151694d7..4035324b22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -514,8 +514,10 @@ jobs:
           ref: ${{ needs.setup.outputs.safari_ref }}
 
       - name: Build Safari extension
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy
+        run: |
+          npm install
+          npm run dist:safari
+        working-directory: dist-safari/browser
 
 
   macos-package-github:
@@ -660,12 +662,15 @@ jobs:
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy
+        run: |
+          npm install
+          npm run dist:safari
+        working-directory: dist-safari/browser
 
       - name: Load Safari extension for .dmg
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -copyonly
+        run: |
+          mkdir PlugIns
+          cp -r dist-safari/browser/dist/Safari/dmg/build/Release/safari.appex PlugIns/safari.appex
 
       - name: Build application (dist)
         env:
@@ -844,12 +849,15 @@ jobs:
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy
+        run: |
+          npm install
+          npm run dist:safari
+        working-directory: dist-safari/browser
 
       - name: Load Safari extension for App Store
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -mas -copyonly
+        run: |
+          mkdir PlugIns
+          cp -r dist-safari/browser/dist/Safari/mas/build/Release/safari.appex PlugIns/safari.appex
 
       - name: Build application for App Store
         run: npm run pack:mac:mas
@@ -1020,12 +1028,15 @@ jobs:
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy
+        run: |
+          npm install
+          npm run dist:safari
+        working-directory: dist-safari/browser
 
       - name: Load Safari extension for App Store
-        shell: pwsh
-        run: ./scripts/safari-build.ps1 -masdev -copyonly
+        run: |
+          mkdir PlugIns
+          cp -r dist-safari/browser/dist/Safari/masdev/build/Release/safari.appex PlugIns/safari.appex
 
       - name: Build dev application for App Store
         run: npm run pack:mac:masdev