ci: address Opus review of the arm64 policy PR

- job timeouts 130 (cac, cac-fpm) / 80 (shared-httpd) so the retry fits; test pins the budget
- verify-image-arch.py: bounded docker calls, pull retried 3x, exit 4 'could not pull' (not an
  arch verdict), pulled image removed afterwards
- ARM64_DIGEST only taken from the first attempt when it succeeded
- comments/docs: max-parallel is per-job and unverified; guard also fires on skipped/cancelled

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
This commit is contained in:
shadowdaoandClaude Sonnet 5.5 committed 2026-11-19 21:12:56 -08:00
1 parent e1ea28e6a8
commit 344c5e8d0d
5 files changed
+44 -20

No files matched your search

+10 -8
View File
@@ -164,7 +164,7 @@ jobs:
needs: plan
if: needs.plan.outputs.cac != '[]'
runs-on: ubuntu-latest
timeout-minutes: 75
timeout-minutes: 130
strategy:
# One PHP version failing (e.g. an EOL stream) must not cancel the
# security builds of the others.
@@ -172,7 +172,8 @@ jobs:
# 2026-11-19: 4+4 QEMU arm64 legs ran at once and 6 of 8 failed on network steps
# (Remi / pkg-cache timeouts, truncated repomd.xml.asc); legs run alone succeeded.
# Caps concurrent legs of this family (max-parallel 1 = safest, slowest; whether
# the runner honours it is unverified).
# the runner honours it is unverified: Gitea expands the matrix server-side). It is a
# per-job cap only: concurrency ACROSS jobs (cac + cac-fpm + shared-httpd) is not bounded.
max-parallel: 2
matrix:
phpver: ${{ fromJSON(needs.plan.outputs.cac) }}
@@ -339,7 +340,7 @@ jobs:
- name: Assemble index tag(s)
env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
PHPVER: ${{ matrix.phpver }}
@@ -359,7 +360,7 @@ jobs:
needs: plan
if: needs.plan.outputs.cac_fpm != '[]'
runs-on: ubuntu-latest
timeout-minutes: 75
timeout-minutes: 130
strategy:
# One PHP version failing (e.g. an EOL stream) must not cancel the
# security builds of the others.
@@ -367,7 +368,8 @@ jobs:
# 2026-11-19: 4+4 QEMU arm64 legs ran at once and 6 of 8 failed on network steps
# (Remi / pkg-cache timeouts, truncated repomd.xml.asc); legs run alone succeeded.
# Caps concurrent legs of this family (max-parallel 1 = safest, slowest; whether
# the runner honours it is unverified).
# the runner honours it is unverified: Gitea expands the matrix server-side). It is a
# per-job cap only: concurrency ACROSS jobs (cac + cac-fpm + shared-httpd) is not bounded.
max-parallel: 2
matrix:
phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }}
@@ -537,7 +539,7 @@ jobs:
- name: Assemble index tag(s)
env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
PHPVER: ${{ matrix.phpver }}
@@ -871,7 +873,7 @@ jobs:
needs: plan
if: needs.plan.outputs.shared_httpd == 'true'
runs-on: ubuntu-latest
timeout-minutes: 50
timeout-minutes: 80
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -1000,7 +1002,7 @@ jobs:
- name: Assemble index tag(s)
env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
run: |