Skip to content

Commit

Permalink
Merge pull request #416 from dennisameling/apple-silicon
Browse files Browse the repository at this point in the history
Download x64 Git on Apple Silicon
  • Loading branch information
niik authored Nov 30, 2020
2 parents 38d8f9f + c273e2f commit 4616f08
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions script/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 4616f08

Please sign in to comment.