Skip to content

@W-23331697 | Preserve target-only manifest fields on auto-promote - #136

Closed
jbisaSF wants to merge 1 commit into
release/26.8from
W-23331697-preserve-manifest-extras-26.8
Closed

jbisaSF wants to merge 1 commit into
release/26.8from
W-23331697-preserve-manifest-extras-26.8

Conversation

@jbisaSF

@jbisaSF jbisaSF commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Fixes the auto-promote bug that wiped 26.9 carousel fields in CI: promote from release/26.8 → release/26.9 #113: merge_manifest_entry treated equal-or-newer versions as a wholesale entry replace, so keys present only on the target (isFeatured, featured*, badge, companyName) were dropped whenever 26.8 lacked them.
  • Equal-or-newer upserts now overlay in place (existing + incoming): source still wins on overlapping keys (version/zip/sha256 keep advancing), target-only keys are preserved, and category order is stable.
  • This change lands on release/26.8 because promote uses the source branch's promotion-utils.sh. 26.8 → 26.9 is the hop that can clobber 26.9-only metadata. After merge, auto-promote should carry the script forward to 26.9.

Test plan

  • bash .github/scripts/test-promotion-utils.sh — 55 passed, including new cases:
  • Confirm a 26.8 → 26.9 promote of Avalara/SFP/Noibu at the same version does not strip carousel fields restored in @W-23331697 | Restore carousel manifest fields for 26.9 #135
  • Confirm promoting a newer ZIP still updates version / zip / sha256 on 26.9

@jbisaSF
jbisaSF requested review from a team August 20, 2026 15:22
… apps, and stop release-to-main PRs

Equal-or-newer upserts overlay in place so target-only carousel fields survive promote. Auto-promo writes INIT catalog.json only for brand-new apps and leaves existing catalogs to the target branch CI job. The newest release branch is the end of the chain; next_release_branch no longer hops to main.
@jbisaSF
jbisaSF force-pushed the W-23331697-preserve-manifest-extras-26.8 branch from 005de59 to 8ac09ec Compare August 20, 2026 15:34
@jbisaSF jbisaSF closed this Aug 20, 2026
@jbisaSF
jbisaSF deleted the W-23331697-preserve-manifest-extras-26.8 branch August 20, 2026 15:34
@jbisaSF

jbisaSF commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Superseded by #137 — this PR closed when the head branch was renamed to W-23938378-auto-promote-26.8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant