Skip to content

Commit fe2db1c

Browse files
committed
Drop the pause between setup-ruby attempts
test_merge_queue_fail_fast.py requires a continue-on-error attempt 1 to be retried by the very next step, so the sleep step in between failed lint-ecosystems. Attempt 2 now follows attempt 1 directly and gets setup-ruby's own ~1 min of backoff retries again. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011f9aeRYC9ragXuhk4udbwz
1 parent 40c541f commit fe2db1c

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,8 +1613,9 @@ jobs:
16131613
# setup-ruby downloads the prebuilt Ruby from a github.com release
16141614
# and gives up after ~1 min of retries. On 2026-11-09 (nightly run
16151615
# 42568829044) a ~4 min release-CDN 504 outage failed two gem legs
1616-
# and hosted-e2e here. Pause and try once more; a second failure
1617-
# is not a blip.
1616+
# and hosted-e2e here. Try once more, with setup-ruby's own ~1 min
1617+
# of retries again; a second failure is not a blip. (Attempt 2
1618+
# must be the very next step: test_merge_queue_fail_fast.py.)
16181619
id: setup-ruby
16191620
if: matrix.suite == 'e2e_gem' || matrix.bundler != ''
16201621
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
@@ -1636,11 +1637,6 @@ jobs:
16361637
bundler: 'none'
16371638
bundler-cache: false
16381639

1639-
- name: Setup Ruby (pause before attempt 2)
1640-
if: (matrix.suite == 'e2e_gem' || matrix.bundler != '') && steps.setup-ruby.outcome != 'success'
1641-
shell: bash
1642-
run: sleep 60
1643-
16441640
- name: Setup Ruby (attempt 2)
16451641
if: (matrix.suite == 'e2e_gem' || matrix.bundler != '') && steps.setup-ruby.outcome != 'success'
16461642
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
@@ -2897,7 +2893,7 @@ jobs:
28972893
run: scripts/pip-install-retry.sh uv && uv --version
28982894

28992895
- name: Setup Ruby (attempt 1)
2900-
# Capped, paused and retried once, as in the e2e job.
2896+
# Capped and retried once, as in the e2e job.
29012897
id: setup-ruby
29022898
if: steps.gate.outputs.run == 'true'
29032899
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
@@ -2910,10 +2906,6 @@ jobs:
29102906
bundler: 'none'
29112907
bundler-cache: false
29122908

2913-
- name: Setup Ruby (pause before attempt 2)
2914-
if: (steps.gate.outputs.run == 'true') && steps.setup-ruby.outcome != 'success'
2915-
run: sleep 60
2916-
29172909
- name: Setup Ruby (attempt 2)
29182910
if: (steps.gate.outputs.run == 'true') && steps.setup-ruby.outcome != 'success'
29192911
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0

0 commit comments

Comments
 (0)