From 109cab2fb721cc5598757c00f44f1ad46d6913a4 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 22 Sep 2020 17:28:09 -0400
Subject: [PATCH] checkout safari via github action

---
 .github/scripts/macos/clean-safari.ps1 |  8 ++++++++
 .github/workflows/build.yml            | 14 ++++++++++++--
 scripts/safari-build.ps1               | 20 +++++++++++---------
 3 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 .github/scripts/macos/clean-safari.ps1

diff --git a/.github/scripts/macos/clean-safari.ps1 b/.github/scripts/macos/clean-safari.ps1
new file mode 100644
index 00000000000..ab3a51d6741
--- /dev/null
+++ b/.github/scripts/macos/clean-safari.ps1
@@ -0,0 +1,8 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+$distDir = $rootPath + "\dist";
+$distSafariDir = $distDir + "\safari";
+
+if (Test-Path -Path $distSafariDir) {
+  Remove-Item -Recurse -Force $distSafariDir
+}
+New-Item $distSafariDir -ItemType Directory -ea 0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a7d23fe182..3ee790b4038 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -150,9 +150,19 @@ jobs:
       - name: Run linter
         run: npm run lint
 
+      - name: Clean safari directory
+        shell: pwsh
+        run: ./scripts/clean-safari.ps1
+
+      - name: Checkout browser extension
+        uses: actions/checkout@v2
+        with:
+          repository: 'bitwarden/browser'
+          path: 'dist/safari'
+
       - name: Build Safari extension for .dmg
         shell: pwsh
-        run: ./scripts/safari-build.ps1
+        run: ./scripts/safari-build.ps1 -skipcheckout
 
       - name: Build application for .dmg
         run: npm run dist:mac
@@ -162,7 +172,7 @@ jobs:
 
       - name: Build Safari extension for App Store
         shell: pwsh
-        run: ./scripts/safari-build.ps1 -mas
+        run: ./scripts/safari-build.ps1 -mas -skipcheckout
 
       - name: Build application for App Store
         run: npm run dist:mac:mas
diff --git a/scripts/safari-build.ps1 b/scripts/safari-build.ps1
index aa33e20451a..afd68fd564d 100644
--- a/scripts/safari-build.ps1
+++ b/scripts/safari-build.ps1
@@ -1,7 +1,8 @@
 param (
   [string] $version,
   [switch] $mas,
-  [switch] $masdev
+  [switch] $masdev,
+  [switch] $skipcheckout
 )
 
 # Dependencies:
@@ -19,18 +20,19 @@ $distSafariAppexMas = $distSafariDir + "\browser\dist\Safari\mas\build\Release\s
 $distSafariAppexMasDev = $distSafariDir + "\browser\dist\Safari\masdev\build\Release\safari.appex";
 $pluginsAppex = $rootDir + "\PlugIns\safari.appex";
 
-if (Test-Path -Path $distSafariDir) {
-  Remove-Item -Recurse -Force $distSafariDir
-}
-
 if (Test-Path -Path $pluginsAppex) {
   Remove-Item -Recurse -Force $pluginsAppex
 }
 
-New-Item $distSafariDir -ItemType Directory -ea 0
-cd $distSafariDir
-git clone git@github.com:bitwarden/browser.git
-cd browser
+if(-not $skipcheckout) {
+  if (Test-Path -Path $distSafariDir) {
+    Remove-Item -Recurse -Force $distSafariDir
+  }
+  New-Item $distSafariDir -ItemType Directory -ea 0
+  cd $distSafariDir
+  git clone git@github.com:bitwarden/browser.git
+  cd browser
+}
 
 if (-not ([string]::IsNullOrEmpty($version))) {
   $tag = "v" + $version