Skip to content

Commit e3534e1

Browse files
committed
Merge main into dev: keep both the draft promotion and the consumer check
main and dev diverged: main was 2 commits ahead (the draft-then-promote release workflow and the .busbar-ref pin to busbar 1.5.3 c8780349cf66d09b891478d50766b89dc1ff224c), dev 7. Releases are cut from main, so nothing shipped was at risk. The hazard was the next dev -> main pull request silently reverting main's fixes. One conflict, .github/workflows/release.yml, and it was a false either-or: the two sides appended DIFFERENT things at the same point in the file. main added the promotion step that flips the Release out of draft once assets are provably attached; dev added a new consumer-verification job that pulls the published artifact back down and checks it works for a stranger. Neither replaces the other, so both are kept, ordered by what they are: main's lines are shell continuation of the verify-assets run: block and now sit immediately after the asset-count check, and dev's is a separate top-level job that follows. Confirmed the result parses as YAML and that all six jobs are present, including the earlier --draft on gh release create that makes main's promotion meaningful. Gate run against a sibling checkout of busbar 1.5.3: cargo fmt --all --check, cargo clippy --all-targets -D warnings and cargo check --tests all pass. Unrelated to this merge and left alone: the consumer-verification job dev added passes bundle_image: 43 10, which is not an image reference. That value is dev's pre-existing content, not something this merge introduced, and it wants a look.
2 parents 7a5990f + 1446a58 commit e3534e1

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

.busbar-ref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5681d648292cdc72b17b2d51c1575c9894b337c1 1.5.2
1+
c8780349cf66d09b891478d50766b89dc1ff224c 1.5.3

.github/workflows/release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
gh release create "${GITHUB_REF_NAME}" \
7272
--repo "${GITHUB_REPOSITORY}" \
7373
--title "busbar-hashicorp-vault ${GITHUB_REF_NAME}" \
74+
--draft \
7475
--verify-tag --generate-notes \
7576
|| gh release view "${GITHUB_REF_NAME}" --repo "${GITHUB_REPOSITORY}"
7677
@@ -210,6 +211,12 @@ jobs:
210211
"delete this tag+release, and re-cut." >&2
211212
exit 1
212213
fi
214+
# Only now, with assets provably attached, does this stop being a draft and become
215+
# the release that `releases/latest` resolves to.
216+
gh release edit "${GITHUB_REF_NAME}" \
217+
--repo "${GITHUB_REPOSITORY}" \
218+
--draft=false --latest
219+
echo "::notice::Published ${GITHUB_REF_NAME} with ${count} asset(s)."
213220
214221
# THE LAST STEP: does what we just published work for a user?
215222
#

0 commit comments

Comments
 (0)