From 67c483fb8890ff7561a4f91ac039fe3fd057cbdb Mon Sep 17 00:00:00 2001 From: Coding-Dev-Tools Date: Thu, 23 Jul 2026 04:51:34 -0400 Subject: [PATCH] Select canonical tag artifacts for release repair --- .github/workflows/release.yml | 8 ++++---- tests/test_release_infrastructure.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e943e05..409b7f53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -298,13 +298,13 @@ jobs: --branch "$RELEASE_TAG" \ --event push \ --limit 20 \ - --json databaseId,headBranch,headSha,event)" + --json databaseId,headBranch,headSha,event,createdAt)" run_id="$(jq -r \ --arg tag "$RELEASE_TAG" \ --arg sha "$tag_sha" \ - 'map(select(.headBranch == $tag and - .headSha == $sha and - .event == "push"))[0].databaseId // empty' \ + 'sort_by(.createdAt) | map(select(.headBranch == $tag and + .headSha == $sha and + .event == "push"))[0].databaseId // empty' \ <<<"$runs")" test -n "$run_id" jobs="$(gh run view "$run_id" --repo "$GH_REPO" --json jobs)" diff --git a/tests/test_release_infrastructure.py b/tests/test_release_infrastructure.py index ac64363f..df64cffb 100644 --- a/tests/test_release_infrastructure.py +++ b/tests/test_release_infrastructure.py @@ -108,10 +108,11 @@ def test_release_repair_requires_tag_sha_successful_build_publish_and_pypi_ident assert '"repos/${GH_REPO}/git/ref/tags/${RELEASE_TAG}"' in repair assert '"repos/${GH_REPO}/git/tags/${tag_sha}"' in repair assert 'test "$object_type" = "commit"' in repair - assert "--json databaseId,headBranch,headSha,event" in repair + assert "--json databaseId,headBranch,headSha,event,createdAt" in repair assert ".headBranch == $tag" in repair assert ".headSha == $sha" in repair assert '.event == "push"' in repair + assert "sort_by(.createdAt)" in repair assert '.name == "Build distributions"' in repair assert '.name == "Publish to PyPI"' in repair assert '.name == "Assemble distributions"' not in repair