Support new Monterey-based 10.11/11 cross images

Homebrew · Feb 28, 2024 · 71c1c7c · 71c1c7c
1 parent e791dc9
commit 71c1c7c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/job.rb b/src/job.rb
@@ -7,7 +7,7 @@
 # Information representing a CI job.
 class Job
  NAME_REGEX =
- /\A(?<runner>\d+(?:\.\d+)?(?:-arm64|-cross)?)-(?<run_id>\d+)(?:-(?<run_attempt>\d+))?(?:-(?<tag>[a-z]+))?\z/
+ /\A(?<runner>\d+(?:\.\d+)?(?:-arm64)?(?:-cross)?)-(?<run_id>\d+)(?:-(?<run_attempt>\d+))?(?:-(?<tag>[a-z]+))?\z/
 
  attr_reader :runner_name, :repository, :github_id, :secret
  attr_writer :orka_setup_timeout
@@ -33,7 +33,7 @@ def os
  end
 
  def arm64?
- os.end_with?("-arm64")
+ os.split("-").include?("arm64")
  end
 
  def run_id

diff --git a/src/orka_start_processor.rb b/src/orka_start_processor.rb
@@ -7,15 +7,16 @@
 # Thread runner responsible for deploying Orka VMs.
 class OrkaStartProcessor < ThreadRunner
  CONFIG_MAP = {
- "10.11-cross" => "highsierra-xcode7",
- "10.15" => "catalina",
- "11" => "bigsur",
- "12" => "monterey",
- "12-arm64" => "monterey-arm64",
- "13" => "ventura",
- "13-arm64" => "ventura-arm64",
- "14" => "sonoma",
- "14-arm64" => "sonoma-arm64",
+ "10.11-cross" => "monterey-1011-cross",
+ "10.15" => "catalina",
+ "11" => "bigsur",
+ "11-arm64-cross" => "monterey-arm64-11-cross",
+ "12" => "monterey",
+ "12-arm64" => "monterey-arm64",
+ "13" => "ventura",
+ "13-arm64" => "ventura-arm64",
+ "14" => "sonoma",
+ "14-arm64" => "sonoma-arm64",
  }.freeze
 
  attr_reader :queue