Merge pull request #11120 from Bo98/macos-label-update

Update Big Sur runner labels

.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:

Library/Homebrew/dev-cmd/dispatch-build-bottle.rb

@@ -55,18 +55,12 @@ module Homebrew
         [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}"