Update Big Sur runner labels

This commit is contained in:
Bo Anderson 2021-04-12 21:20:19 +01:00
parent f1c08c3801
commit c972d330cb
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 1 additions and 7 deletions

View File

@ -16,7 +16,7 @@ jobs:
tests: tests:
strategy: strategy:
matrix: matrix:
version: ["11-arm", "11.0", "10.15", "10.14"] version: ["11-arm64", "11", "10.15", "10.14"]
fail-fast: false fail-fast: false
runs-on: ${{ matrix.version }} runs-on: ${{ matrix.version }}
env: env:

View File

@ -55,18 +55,12 @@ module Homebrew
[MacOS::Version.new(os), arch&.to_sym] [MacOS::Version.new(os), arch&.to_sym]
end end
# TODO: fix label name to be 11-arm64 instead.
arch = :arm if arch == :arm64
macos_label = if arch.present? && arch != :x86_64 macos_label = if arch.present? && arch != :x86_64
"#{os}-#{arch}" "#{os}-#{arch}"
else else
os.to_s os.to_s
end end
# TODO: fix label name to be 11 instead.
macos_label = "11.0" if macos_label == "11"
dispatching_for = "macOS #{macos_label}" dispatching_for = "macOS #{macos_label}"
elsif T.unsafe(args).linux? elsif T.unsafe(args).linux?
workflow = args.workflow || "linux-#{workflow}" workflow = args.workflow || "linux-#{workflow}"