Merge pull request #949 from ajthom90/master

Download x64 binary on Apple Silicon
eirslett · Dec 15, 2020 · 7356784 · 7356784
2 parents 2830bcd + b98fda8
commit 7356784
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...nd-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java b/...nd-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java
@@ -135,7 +135,12 @@ public String getNodeDownloadFilename(String nodeVersion, boolean archiveOnWindo
     }
 
     public String getNodeClassifier() {
-        String result = getCodename() + "-" + architecture.name();
+        final String result;
+        if(isMac() && architecture == Architecture.arm64) { // this check is required to download the x64 binary until there is an arm64 version available for macOS (darwin).
+            result = getCodename() + "-" + Architecture.x64.name();
+        } else {
+            result = getCodename() + "-" + architecture.name();
+        }
         return classifier != null ? result + "-" + classifier : result;
     }
 }
diff --git a/...lugin-core/src/test/java/com/github/eirslett/maven/plugins/frontend/lib/PlatformTest.java b/...lugin-core/src/test/java/com/github/eirslett/maven/plugins/frontend/lib/PlatformTest.java
@@ -31,6 +31,18 @@ public void detect_win_doesntLookForAlpine() {
         verifyNoMoreInteractions(File.class); // doesn't look for a file path
     }
 
+    @Test
+    public void detect_arm_mac_download_x64_binary() {
+        mockStatic(OS.class);
+        mockStatic(Architecture.class);
+
+        when(OS.guess()).thenReturn(OS.Mac);
+        when(Architecture.guess()).thenReturn(Architecture.arm64);
+
+        Platform platform = Platform.guess();
+        assertEquals("darwin-x64", platform.getNodeClassifier());
+    }
+
     @Test
     public void detect_linux_notAlpine() throws Exception {
         mockStatic(OS.class);