Skip to content
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.

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

Backport of ci: Fix changelog-checker GHA workflow into release/1.11.x #14848

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #14842 to be assessed for backporting due to the inclusion of the label backport/1.11.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: unable to process merge commit: "aa750a5b2624a6ee8ffa63dc8fe0ef74015dff10", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

I was recently working on some manual backports for 1.11 in #14828 and others and the changelog-checker workflow was failing despite having added a proper changelog entry. When I looked into it, it seems that there is some broken shell code in the action that is making it fail for the case where the base is not the default branch. In my case, the base branch was release/1.11.x.

Some history: it looks like back in #10844, there was a bit of a refactor/update to the checker logic that added this default branch case. I guess we just missed the bug in the code review.

In any case, this should fix it!

Testing & Reproduction steps

I tested this by pulling the body of the checker out into a shell script and manually running it with the arguments for my pull request. The contents of the script are here in case you want to try it yourself: https://gist.github.com/eculver/ff83d81e09e5e030f817cf6212c6951f

It should exit 0 on a successful run and output (along with some other debug output)

Found .changelog entry in PR!

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/eculver/fix-changelog-checker/absolutely-grateful-jay branch from b9fdce4 to e039bda Compare October 3, 2022 23:49
@github-actions github-actions bot added the theme/contributing Additions and enhancements to community contributing materials label Oct 3, 2022
@eculver eculver force-pushed the backport/eculver/fix-changelog-checker/absolutely-grateful-jay branch from e039bda to 9b875d1 Compare October 3, 2022 23:55
@eculver eculver force-pushed the backport/eculver/fix-changelog-checker/absolutely-grateful-jay branch from 9b875d1 to 6407ef5 Compare October 3, 2022 23:55
@eculver eculver marked this pull request as ready for review October 3, 2022 23:56
@eculver eculver added the pr/no-changelog PR does not need a corresponding .changelog entry label Oct 3, 2022
@eculver eculver merged commit a5aa096 into release/1.11.x Oct 4, 2022
@eculver eculver deleted the backport/eculver/fix-changelog-checker/absolutely-grateful-jay branch October 4, 2022 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-changelog PR does not need a corresponding .changelog entry theme/contributing Additions and enhancements to community contributing materials
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants