From 7e1c6e0ee288a71efeb8313e183aa951a2a7cdf9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 24 Sep 2020 10:20:56 -0400
Subject: [PATCH] dist build for all

---
 .github/workflows/build.yml |  6 ++++++
 scripts/safari-build.ps1    | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fcd84df5..cb3fa1c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -180,3 +180,9 @@ jobs:
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+
+      - name: Publish to App Store
+        run: npm run upload:mas
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
diff --git a/scripts/safari-build.ps1 b/scripts/safari-build.ps1
index 49851391..5d44bcc0 100644
--- a/scripts/safari-build.ps1
+++ b/scripts/safari-build.ps1
@@ -2,7 +2,8 @@
   [string] $version,
   [switch] $mas,
   [switch] $masdev,
-  [switch] $skipcheckout
+  [switch] $skipcheckout,
+  [switch] $skipoutcopy
 )
 
 # Dependencies:
@@ -45,16 +46,18 @@ if (-not ([string]::IsNullOrEmpty($version))) {
 }
 
 npm i
-if ($mas) {
-  npm run dist:safari:mas
-  Copy-Item -Path $distSafariAppexMas -Destination $pluginsAppex –Recurse
-}
-elseif ($masdev) {
-  npm run dist:safari
-  Copy-Item -Path $distSafariAppexMasDev -Destination $pluginsAppex –Recurse
-}
-else {
-  npm run dist:safari:dmg
-  Copy-Item -Path $distSafariAppexDmg -Destination $pluginsAppex –Recurse
+npm run dist:safari
+
+if (-not $skipoutcopy) {
+  if ($mas) {
+    Copy-Item -Path $distSafariAppexMas -Destination $pluginsAppex –Recurse
+  }
+  elseif ($masdev) {
+    Copy-Item -Path $distSafariAppexMasDev -Destination $pluginsAppex –Recurse
+  }
+  else {
+    Copy-Item -Path $distSafariAppexDmg -Destination $pluginsAppex –Recurse
+  }
 }
+
 cd $rootDir