github_runner_matrix: decouple macOS versions from `MacOSVersion#supp…

…orted_release?` See discussion at #18296.
Homebrew · Sep 11, 2024 · d0d1d45 · d0d1d45
1 parent d20fdad
commit d0d1d45
Showing 1 changed file with 30 additions and 19 deletions.
diff --git a/Library/Homebrew/github_runner_matrix.rb b/Library/Homebrew/github_runner_matrix.rb
@@ -77,8 +77,10 @@ def active_runner_specs_hash
   private
 
   SELF_HOSTED_LINUX_RUNNER = "linux-self-hosted-1"
-  GITHUB_ACTIONS_LONG_TIMEOUT = 4320
-  GITHUB_ACTIONS_SHORT_TIMEOUT = 120
+  # ARM macOS timeout, keep this under 1/2 of GitHub's job execution time limit for self-hosted runners.
+  # https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#usage-limits
+  GITHUB_ACTIONS_LONG_TIMEOUT = 2160 # 36 hours
+  GITHUB_ACTIONS_SHORT_TIMEOUT = 60
 
   sig { returns(LinuxRunnerSpec) }
   def linux_runner_spec
@@ -118,6 +120,15 @@ def create_runner(platform, arch, spec, macos_version = nil)
     runner.freeze
   end
 
+  NEWEST_HOMEBREW_CORE_MACOS_RUNNER = :sonoma
+  OLDEST_HOMEBREW_CORE_MACOS_RUNNER = :monterey
+  NEWEST_HOMEBREW_CORE_INTEL_MACOS_RUNNER = :sonoma
+
+  sig { params(macos_version: MacOSVersion).returns(T::Boolean) }
+  def runner_enabled?(macos_version)
+    macos_version <= NEWEST_HOMEBREW_CORE_MACOS_RUNNER && macos_version >= OLDEST_HOMEBREW_CORE_MACOS_RUNNER
+  end
+
   NEWEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER = :ventura
   OLDEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER = :big_sur
   NEWEST_GITHUB_ACTIONS_ARM_MACOS_RUNNER = :sonoma
@@ -149,49 +160,49 @@ def generate_runners!
 
     MacOSVersion::SYMBOLS.each_value do |version|
       macos_version = MacOSVersion.new(version)
-      next if macos_version.unsupported_release?
+      next unless runner_enabled?(macos_version)
 
-      github_runner_available = macos_version <= NEWEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER &&
-                                macos_version >= OLDEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER
+      github_runner_available = macos_version <= NEWEST_GITHUB_ACTIONS_ARM_MACOS_RUNNER &&
+                                macos_version >= OLDEST_GITHUB_ACTIONS_ARM_MACOS_RUNNER
 
       runner, timeout = if use_github_runner && github_runner_available
         ["macos-#{version}", GITHUB_ACTIONS_RUNNER_TIMEOUT]
+      elsif macos_version >= :monterey
+        ["#{version}-arm64#{ephemeral_suffix}", runner_timeout]
       else
-        ["#{version}-x86_64#{ephemeral_suffix}", runner_timeout]
+        ["#{version}-arm64", runner_timeout]
       end
 
-      # macOS 12-x86_64 is usually slower.
-      timeout += 30 if macos_version <= :monterey
       spec = MacOSRunnerSpec.new(
-        name:    "macOS #{version}-x86_64",
+        name:    "macOS #{version}-arm64",
         runner:,
         timeout:,
         cleanup: !runner.end_with?(ephemeral_suffix),
       )
-      @runners << create_runner(:macos, :x86_64, spec, macos_version)
+      @runners << create_runner(:macos, :arm64, spec, macos_version)
 
-      next if macos_version < :big_sur
+      next if macos_version > NEWEST_HOMEBREW_CORE_INTEL_MACOS_RUNNER
 
-      github_runner_available = macos_version <= NEWEST_GITHUB_ACTIONS_ARM_MACOS_RUNNER &&
-                                macos_version >= OLDEST_GITHUB_ACTIONS_ARM_MACOS_RUNNER
+      github_runner_available = macos_version <= NEWEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER &&
+                                macos_version >= OLDEST_GITHUB_ACTIONS_INTEL_MACOS_RUNNER
 
       runner, timeout = if use_github_runner && github_runner_available
         ["macos-#{version}", GITHUB_ACTIONS_RUNNER_TIMEOUT]
-      elsif macos_version >= :monterey
-        ["#{version}-arm64#{ephemeral_suffix}", runner_timeout]
       else
-        ["#{version}-arm64", runner_timeout]
+        ["#{version}-x86_64#{ephemeral_suffix}", runner_timeout]
       end
 
+      # macOS 12-x86_64 is usually slower.
+      timeout += 30 if macos_version <= :monterey
       # The ARM runners are typically over twice as fast as the Intel runners.
-      timeout /= 2 if !(use_github_runner && github_runner_available) && timeout < GITHUB_ACTIONS_LONG_TIMEOUT
+      timeout *= 2 if !(use_github_runner && github_runner_available) && timeout < GITHUB_ACTIONS_LONG_TIMEOUT
       spec = MacOSRunnerSpec.new(
-        name:    "macOS #{version}-arm64",
+        name:    "macOS #{version}-x86_64",
         runner:,
         timeout:,
         cleanup: !runner.end_with?(ephemeral_suffix),
       )
-      @runners << create_runner(:macos, :arm64, spec, macos_version)
+      @runners << create_runner(:macos, :x86_64, spec, macos_version)
     end
 
     @runners.freeze