Repository navigation
fix(utah-install-set): fetch Utah's base.toml, falling back to bluefin.toml - #1052
Conversation
…n.toml projectbluefin/utah#1253 renames Utah's base manifest from packages/bluefin.toml to packages/base.toml with unchanged sections. The advisory install-set check fetched the old name from Utah's main, so the rename would 404 the fetch and silently drop the check. Fetch base.toml first and fall back to bluefin.toml only on a 404, so the check works on both sides of the rename. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving. This fixes the cross-repo break I raised on projectbluefin/utah#1253.
Checked:
fetch()now asks forpackages/base.tomlfirst and falls back topackages/bluefin.tomlonly on a 404 for the manifest key. Any other status, or a 404 on another file, still raises.install_setis computed at fetch time from the pathsfetch()returns, andresolveonly reads thepackages.txtwritten from them, so no hard-codedbluefin.tomlremains in the code path. The remaining mentions are the fallback constant and its comments.- The four new tests cover a ref from before the rename, both names existing (base.toml wins), both missing, and the 404-only rule.
Landing this before or with utah#1253 keeps "Fetch what Utah installs" working through the rename.
|
@Danathar approved head |
|
@Danathar approved head |
0afd286
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @hanthor, head
Hive did not add the |
|
@Danathar approved head |
|
@Danathar approved head |
|
@Danathar approved head |
|
@Danathar approved head |
|
@Danathar approved head |
|
@hanthor this PR is back in your court ( Failing checks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (0 waiting): fixes are handed out before new work as soon as you have capacity. |
projectbluefin/utah#1253 renames Utah's base manifest
packages/bluefin.toml→packages/base.toml(sections unchanged).tools/utah_install_set.pyfetched the old path from Utah'smain, so the publish workflow's advisory step Fetch what Utah installs, and its base image would 404 once the rename lands (it iscontinue-on-error, so the check would quietly fall back instead of running).FILES["manifest"]is nowpackages/base.toml; a newFALLBACKSmap retriespackages/bluefin.tomlonly on an HTTP 404 for the manifest. Any other error, or a 404 on another file, still raises.base.tomlorbluefin.toml);main()already uses the returned path.base.toml; new cases for old ref →bluefin.toml, both present →base.toml, missing under both names → error, non-404 / non-manifest 404 → no fallback.docs/architecture.mdinstall-set paragraph and thepublish-repository.ymlstep comment name both paths.Once utah#1253 is on Utah's main, the fallback can be dropped.
Verification:
python3 tools/utah_install_set.py fetch --dir …against Utahmain(old name, falls back →bluefin.toml, 319 packages) and againstfeat/dakota-parity-target(utah#1253 head →base.toml, 319 packages).just check: green (1571 passed).