From 7274fb183d6303ed707eecd73f636d8e4824d1f5 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Fri, 21 Mar 2025 15:42:19 +0800 Subject: [PATCH] github_runner_matrix: include arch in Linux job names This will make it easier to distinguish the two jobs in the GitHub UI. --- Library/Homebrew/github_runner_matrix.rb | 2 +- Library/Homebrew/test/github_runner_matrix_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/github_runner_matrix.rb b/Library/Homebrew/github_runner_matrix.rb index 47adfb22d4..c3e13c7967 100644 --- a/Library/Homebrew/github_runner_matrix.rb +++ b/Library/Homebrew/github_runner_matrix.rb @@ -92,7 +92,7 @@ class GitHubRunnerMatrix end LinuxRunnerSpec.new( - name: "Linux", + name: "Linux #{arch}", runner: linux_runner, container: { image: "ghcr.io/homebrew/ubuntu22.04:master", diff --git a/Library/Homebrew/test/github_runner_matrix_spec.rb b/Library/Homebrew/test/github_runner_matrix_spec.rb index d314f3522b..2920ca6698 100644 --- a/Library/Homebrew/test/github_runner_matrix_spec.rb +++ b/Library/Homebrew/test/github_runner_matrix_spec.rb @@ -90,7 +90,7 @@ RSpec.describe GitHubRunnerMatrix do expect(runner_matrix.runners.all?(&:active)).to be(false) expect(runner_matrix.runners.any?(&:active)).to be(true) - expect(get_runner_names(runner_matrix)).to eq(["Linux"]) + expect(get_runner_names(runner_matrix)).to eq(["Linux x86_64"]) end end @@ -139,7 +139,7 @@ RSpec.describe GitHubRunnerMatrix do expect(runner_matrix.runners.all?(&:active)).to be(false) expect(runner_matrix.runners.any?(&:active)).to be(true) - expect(get_runner_names(runner_matrix).sort).to eq(["Linux", "macOS #{v}-arm64"]) + expect(get_runner_names(runner_matrix).sort).to eq(["Linux x86_64", "macOS #{v}-arm64"]) end end end @@ -276,7 +276,7 @@ RSpec.describe GitHubRunnerMatrix do allow(Formula).to receive(:all).and_return([testball, testball_depender_linux].map(&:formula)) matrix = described_class.new([testball], ["deleted"], all_supported: false, dependent_matrix: true) - expect(get_runner_names(matrix)).to eq(["Linux"]) + expect(get_runner_names(matrix)).to eq(["Linux x86_64"]) end end