admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

github_runner_matrix: remove GITHUB_RUN_ATTEMPT

Browse Source 
This should no longer be needed after
Homebrew/ci-orchestrator@845d26ccc0.
This commit is contained in:
Carlo Cabrera 2023-05-29 22:19:23 +08:00
parent 89dfe4fc5b
commit 40166eb5e7
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/doctor.yml vendored
View File

@ -18,13 +18,13 @@ jobs:
strategy:
matrix:
include:
- runner: "13-arm64-${{github.run_id}}-${{github.run_attempt}}"
- runner: "12-arm64-${{github.run_id}}-${{github.run_attempt}}"
- runner: "12-${{github.run_id}}-${{github.run_attempt}}"
- runner: "13-arm64-${{ github.run_id }}"
- runner: "13-${{ github.run_id }}"
- runner: "12-arm64-${{ github.run_id }}"
- runner: "12-${{ github.run_id }}"
- runner: "11-arm64"
cleanup: true
- runner: "11-${{github.run_id}}-${{github.run_attempt}}"
- runner: "10.15-${{github.run_id}}-${{github.run_attempt}}"
- runner: "11-${{ github.run_id }}"
fail-fast: false
runs-on: ${{ matrix.runner }}
env:

3
Library/Homebrew/github_runner_matrix.rb
View File

@ -112,11 +112,10 @@ class GitHubRunnerMatrix
@runners << create_runner(:linux, :x86_64, linux_runner_spec)
github_run_id = ENV.fetch("GITHUB_RUN_ID")
github_run_attempt = ENV.fetch("GITHUB_RUN_ATTEMPT")
timeout = ENV.fetch("HOMEBREW_MACOS_TIMEOUT").to_i
use_github_runner = ENV.fetch("HOMEBREW_MACOS_BUILD_ON_GITHUB_RUNNER", "false") == "true"
ephemeral_suffix = +"-#{github_run_id}-#{github_run_attempt}"
ephemeral_suffix = +"-#{github_run_id}"
ephemeral_suffix << "-deps" if @dependent_matrix
ephemeral_suffix.freeze