Merge branch '1.x' into 2.x

orchestral · Jul 21, 2023 · f71d0bd · f71d0bd
2 parents 0354868 + 7c6a48d
commit f71d0bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/dusk-updater`.
 
+## 1.6.2
+
+Released: 2023-07-21
+
+### Fixes
+
+* Fixes `mac_arm64` and remove `win64` platform name.
+
 ## 1.6.1
 
 Released: 2023-07-21

diff --git a/src/Command.php b/src/Command.php
@@ -98,8 +98,6 @@ protected function resolveDownloadUrl(string $version, string $slug): string
         if (version_compare($version, '113.0', '<')) {
             if ($slug == 'mac_arm64' && version_compare($version, '106.0.5249', '<')) {
                 $slug == 'mac64_m1';
-            } elseif ($slug === 'win64') {
-                $slug = 'win';
             }
 
             return sprintf('https://chromedriver.storage.googleapis.com/%s/chromedriver_%s.zip', $version, $slug);
@@ -109,7 +107,7 @@ protected function resolveDownloadUrl(string $version, string $slug): string
 
         $slugs = [
             'mac64' => 'mac-x64',
-            'mac_arm64' => 'mac-x64',
+            'mac_arm64' => 'mac-arm64',
         ];
 
         $slug = $slugs[$slug] ?? $slug;

diff --git a/src/OperatingSystem.php b/src/OperatingSystem.php
@@ -10,7 +10,7 @@ class OperatingSystem
     public static function id(): string
     {
         if (static::onWindows()) {
-            return \defined('PHP_INT_SIZE') && PHP_INT_SIZE === 8 ? 'win64' : 'win';
+            return 'win';
         } elseif (static::onMac()) {
             return static::macArchitectureId();
         }