Skip to content

chore: fix filenames and format in changelog unclog files (backport #2827)#2837

Merged
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2827
Apr 18, 2024
Merged

chore: fix filenames and format in changelog unclog files (backport #2827)#2837
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2827

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 18, 2024

I've just spotted several problems in our changelog unclog data (one of them long-standing!).

This PR fixes them.

The backport to v0.38.x and v0.37.x will only be partial (only the entry fixed on v0.37.0).


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

This is an automatic backport of pull request #2827 done by [Mergify](https://mergify.com).

I've just spotted several problems in our changelog unclog data (one of
them long-standing!).

This PR fixes them.

The backport to `v0.38.x` and `v0.37.x` will only be partial (only the
entry fixed on `v0.37.0`).

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] ~~Updated relevant documentation (`docs/` or `spec/`) and code
comments~~
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit b846639)

# Conflicts:
#	.changelog/v0.37.5/improvements/2328-e2e-log-sent-txs.md
#	.changelog/v0.37.5/improvements/2788-move-ws-info-log-to-debug.md
@mergify mergify bot requested a review from a team as a code owner April 18, 2024 05:19
@mergify mergify bot added the conflicts label Apr 18, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Apr 18, 2024

Cherry-pick of b846639 has failed:

On branch mergify/bp/v0.37.x/pr-2827
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit b8466398a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	renamed:    .changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode -> .changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .changelog/v0.37.5/improvements/2328-e2e-log-sent-txs.md
	added by them:   .changelog/v0.37.5/improvements/2788-move-ws-info-log-to-debug.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@melekes melekes merged commit 8bd69b9 into v0.37.x Apr 18, 2024
@melekes melekes deleted the mergify/bp/v0.37.x/pr-2827 branch April 18, 2024 06:04
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.

2 participants