Skip to content

Fix release-tag.sh changelog check failing under pipefail #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phinze wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix release-tag.sh changelog check failing under pipefail #976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion hack/release-tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ if [ "$JJ_MODE" = true ]; then
if [ "$FORCE" = true ]; then
echo "Warning: Skipping changelog check (--force); fetch and origin/main targeting still run"
else
if ! git show "$TARGET":docs/docs/changelog.md 2>/dev/null | grep -q "^## $VERSION"; then
# Read the changelog into a variable rather than piping it. `grep -q` exits
# on its first match, which SIGPIPEs `git show` into exit 141, and pipefail
# turns that into a failed check even when the version is present.
REMOTE_CHANGELOG=$(git show "$TARGET":docs/docs/changelog.md 2>/dev/null || true)

if ! grep -q "^## $VERSION" <<<"$REMOTE_CHANGELOG"; then
echo "Error: origin/main changelog does not contain '## $VERSION'"
echo "Has the release PR been merged?"
echo "Or use --force to skip this check"
Expand Down
Loading