From 487546b4593ebc51049a1b00e44279f3297971db Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Sat, 28 Nov 2020 19:49:35 +0100
Subject: [PATCH 1/3] Download x64 Git on Apple Silicon

---
 script/config.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/script/config.js b/script/config.js
index 753fef8c..45200e6a 100644
--- a/script/config.js
+++ b/script/config.js
@@ -28,6 +28,12 @@ function getConfig() {
     arch = 'ia32';
   }
 
+  if (process.platform === 'darwin' && arch === 'arm64') {
+    // Use the Dugite Native x64 package for MacOS arm64 (arm64 can run x64 code through emulation with Rosetta)
+    console.log('Downloading x64 Dugite Native for Apple Silicon (arm64)');
+    arch = 'x64';
+  }
+
   // Os.arch() calls it x32, we use x86 in actions, dugite-native calls it x86 and our embedded-git.json calls it ia32
   if (arch === 'x32' || arch === 'x86') {
     arch = 'ia32'

From ad791d1a363c5d6a0f5b3723d70f6b3811428c4a Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Mon, 30 Nov 2020 12:56:32 +0100
Subject: [PATCH 2/3] Add fake arm64 runners

This will let us verify that the download is working as intended on arm64
---
 .github/workflows/ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 003727c1..69ac9109 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,11 +18,18 @@ jobs:
         include:
           - os: macos-10.15
             friendlyName: macOS
+            arch: x64
+          - os: macos-10.15
+            friendlyName: macOS
+            arch: arm64
           - os: windows-2019
             friendlyName: Windows
           - os: windows-2019
             friendlyName: Windows
             arch: x86
+          - os: windows-2019
+            friendlyName: Windows
+            arch: arm64
           - os: ubuntu-18.04
             friendlyName: Linux
     timeout-minutes: 10

From c273e2fc496bdba2fe8a98bca99fc9daf6eb2d5b Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Mon, 30 Nov 2020 13:06:03 +0100
Subject: [PATCH 3/3] Revert "Add fake arm64 runners"

This reverts commit ad791d1a363c5d6a0f5b3723d70f6b3811428c4a.
---
 .github/workflows/ci.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69ac9109..003727c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,18 +18,11 @@ jobs:
         include:
           - os: macos-10.15
             friendlyName: macOS
-            arch: x64
-          - os: macos-10.15
-            friendlyName: macOS
-            arch: arm64
           - os: windows-2019
             friendlyName: Windows
           - os: windows-2019
             friendlyName: Windows
             arch: x86
-          - os: windows-2019
-            friendlyName: Windows
-            arch: arm64
           - os: ubuntu-18.04
             friendlyName: Linux
     timeout-minutes: 10