From 7373347c7ce72e423ca42c3515caa3c66a46b024 Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Mon, 6 Jan 2020 09:11:32 +0000 Subject: [PATCH] [release/homebrew] Always use x64 binaries on macOS We no longer support ia32 Macs (see linked issue). Bug: https://github.com/dart-lang/sdk/issues/39810 Change-Id: I5fc6ab6a9074e54a90e8480d0ede416a237733cf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130360 Reviewed-by: William Hesse --- tools/apps/update_homebrew/lib/src/impl.dart | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/tools/apps/update_homebrew/lib/src/impl.dart b/tools/apps/update_homebrew/lib/src/impl.dart index 4d4cf860751..3c1acab8de0 100644 --- a/tools/apps/update_homebrew/lib/src/impl.dart +++ b/tools/apps/update_homebrew/lib/src/impl.dart @@ -12,7 +12,6 @@ const _x64Files = { 'linux-arm': 'sdk/dartsdk-linux-arm64-release.zip', }; const _ia32Files = { - 'mac': 'sdk/dartsdk-macos-ia32-release.zip', 'linux': 'sdk/dartsdk-linux-ia32-release.zip', 'linux-arm': 'sdk/dartsdk-linux-arm-release.zip', }; @@ -93,13 +92,8 @@ class Dart < Formula version "$stableVersion" if OS.mac? - if Hardware::CPU.is_64_bit? - url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['mac']}" - sha256 "${hashes['stable'][_x64Files['mac']]}" - else - url "$_urlBase/stable/release/${revisions['stable']}/${_ia32Files['mac']}" - sha256 "${hashes['stable'][_ia32Files['mac']]}" - end + url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['mac']}" + sha256 "${hashes['stable'][_x64Files['mac']]}" elsif OS.linux? && Hardware::CPU.intel? if Hardware::CPU.is_64_bit? url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['linux']}" @@ -121,13 +115,8 @@ class Dart < Formula devel do version "$devVersion" if OS.mac? - if Hardware::CPU.is_64_bit? - url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['mac']}" - sha256 "${hashes['dev'][_x64Files['mac']]}" - else - url "$_urlBase/dev/release/${revisions['dev']}/${_ia32Files['mac']}" - sha256 "${hashes['dev'][_ia32Files['mac']]}" - end + url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['mac']}" + sha256 "${hashes['dev'][_x64Files['mac']]}" elsif OS.linux? && Hardware::CPU.intel? if Hardware::CPU.is_64_bit? url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['linux']}"