From c972d330cb2efeb3e25ac6bd947981d7c5abee32 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Mon, 12 Apr 2021 21:20:19 +0100 Subject: [PATCH] Update Big Sur runner labels --- .github/workflows/doctor.yml | 2 +- Library/Homebrew/dev-cmd/dispatch-build-bottle.rb | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml index de25c282c2700..859b001921f9c 100644 --- a/.github/workflows/doctor.yml +++ b/.github/workflows/doctor.yml @@ -16,7 +16,7 @@ jobs: tests: strategy: matrix: - version: ["11-arm", "11.0", "10.15", "10.14"] + version: ["11-arm64", "11", "10.15", "10.14"] fail-fast: false runs-on: ${{ matrix.version }} env: diff --git a/Library/Homebrew/dev-cmd/dispatch-build-bottle.rb b/Library/Homebrew/dev-cmd/dispatch-build-bottle.rb index cb857df69da2a..8e706acc02e5c 100644 --- a/Library/Homebrew/dev-cmd/dispatch-build-bottle.rb +++ b/Library/Homebrew/dev-cmd/dispatch-build-bottle.rb @@ -55,18 +55,12 @@ def dispatch_build_bottle [MacOS::Version.new(os), arch&.to_sym] end - # TODO: fix label name to be 11-arm64 instead. - arch = :arm if arch == :arm64 - macos_label = if arch.present? && arch != :x86_64 "#{os}-#{arch}" else os.to_s end - # TODO: fix label name to be 11 instead. - macos_label = "11.0" if macos_label == "11" - dispatching_for = "macOS #{macos_label}" elsif T.unsafe(args).linux? workflow = args.workflow || "linux-#{workflow}"