Merge pull request #122 from zonkyio/windows-arm

#116 Add support for running in x86 emulation on Windows ARM platform
zonkyio · Nov 24, 2023 · 07c4766 · 07c4766
2 parents a66ae39 + 4ebfe31
commit 07c4766
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java b/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java
@@ -63,12 +63,13 @@ public InputStream getPgBinary(String system, String machineHardware) throws IOE
             return resource.getInputStream();
         }
 
-        if (StringUtils.equals(system, "Darwin") && StringUtils.equals(machineHardware, "aarch64")) {
+        if ((StringUtils.equals(system, "Darwin") && StringUtils.equals(machineHardware, "aarch64"))
+                || (StringUtils.equals(system, "Windows") && StringUtils.equals(architecture, "arm_64"))) {
             resource = findPgBinary(normalize(format("postgres-%s-%s.txz", system, "x86_64")));
             if (resource != null) {
-                logger.warn("No native binaries supporting aarch64 architecture found. " +
-                        "Trying to use binaries for amd64 architecture instead: '{}'. " +
-                        "Make sure you have Rosetta 2 emulation enabled. " +
+                logger.warn("No native binaries supporting ARM architecture found. " +
+                        "Trying to use binaries for x64 architecture instead: '{}'. " +
+                        "Make sure you have enabled emulation for this purpose. " +
                         "Note that performance may be degraded.", resource.getFilename());
                 return resource.getInputStream();
             }