sundowndev
/
homebrew-core
mirror of https://github.com/sundowndev/homebrew-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

workflows: support ephemeral 13-arm64

master
Bo Anderson 2022-10-17 15:39:58 +01:00 committed by GitHub
parent 783c6b5b37
commit bd3a103351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dispatch-build-bottle.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
.map(s => s.trim()) .map(s => s.trim())
.filter(Boolean) .filter(Boolean)
.map(s => { .map(s => {
if (intelMacOSRegex.test(s)) // Ephemeral runners if (intelMacOSRegex.test(s) || s == "13-arm64") // Ephemeral runners
return {runner: `${s}-${context.runId}-${process.env.GITHUB_RUN_ATTEMPT}`}; return {runner: `${s}-${context.runId}-${process.env.GITHUB_RUN_ATTEMPT}`};
else if (linuxRegex.test(s)) else if (linuxRegex.test(s))
return { return {

18
cmd/determine-rebottle-runners.rb
View File

@ -48,10 +48,13 @@ module Homebrew
if macos_version.outdated_release? || macos_version.prerelease? if macos_version.outdated_release? || macos_version.prerelease?
nil nil
else else
macos_runners = [{ ephemeral_suffix = "-#{ENV.fetch("GITHUB_RUN_ID")}-#{ENV.fetch("GITHUB_RUN_ATTEMPT")}"
runner: "#{macos_version}-#{ENV.fetch("GITHUB_RUN_ID")}-#{ENV.fetch("GITHUB_RUN_ATTEMPT")}", macos_runners = [{ runner: "#{macos_version}#{ephemeral_suffix}" }]
}] if macos_version >= :ventura
macos_runners << { runner: "#{macos_version}-arm64" } if macos_version >= :big_sur macos_runners << { runner: "#{macos_version}-arm64#{ephemeral_suffix}" }
elsif macos_version >= :big_sur
macos_runners << { runner: "#{macos_version}-arm64" }
end
macos_runners macos_runners
end end
end << linux_runner_spec end << linux_runner_spec
@ -63,10 +66,9 @@ module Homebrew
nil # Don't rebottle for older macOS versions (no CI to build them). nil # Don't rebottle for older macOS versions (no CI to build them).
else else
runner = macos_version.to_s runner = macos_version.to_s
runner += if tag.arch == :x86_64 runner += "-#{tag.arch}" if tag.arch != :x86_64
"-#{ENV.fetch("GITHUB_RUN_ID")}-#{ENV.fetch("GITHUB_RUN_ATTEMPT")}" if tag.arch == :x86_64 || macos_version >= :ventura
else runner += "-#{ENV.fetch("GITHUB_RUN_ID")}-#{ENV.fetch("GITHUB_RUN_ATTEMPT")}"
"-#{tag.arch}"
end end
{ runner: runner } { runner: runner }
end end