Skip to content

Backport of Fix Backport Assistant PR commenting into release/1.15.x#18202

Merged
zalimeni merged 1 commit into
release/1.15.xfrom
backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish
Jul 20, 2023
Merged

Backport of Fix Backport Assistant PR commenting into release/1.15.x#18202
zalimeni merged 1 commit into
release/1.15.xfrom
backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


For general comments on a PR, it looks like you have to use the /issue endpoint rather than /pulls, which requires commit/other review-specific target details.

This matches the endpoint used in backport-reminder.yml.

Also remove the noisier Backport Reminder workflow in favor of recent automation to assign backport PRs to authors.

Description

Follow-up to #17197, plus a noise-reduction fix.

Testing & Reproduction steps

Ran:

github_message="Backport failed @zalimeni. Run: [this is a test to fix broken commenting, no link included]"
          curl -s -H "Authorization: token ${PR_COMMENT_TOKEN}" \
            -X POST \
            -d "{ \"body\": \"${github_message}\"}" \
            "https://api.github.com/repos/hashicorp/consul/issues//comments"

and it worked. (I also fat-fingered the PR I meant to target the first time 😛)

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish branch from c98767a to 1f00ccd Compare July 20, 2023 15:39
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish branch 2 times, most recently from 88e702e to 1f00ccd Compare July 20, 2023 15:39
@github-actions github-actions Bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Jul 20, 2023
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel Bot temporarily deployed to Preview – consul-ui-staging July 20, 2023 15:43 Inactive
@vercel vercel Bot temporarily deployed to Preview – consul July 20, 2023 15:45 Inactive
* Fix Backport Assistant failure PR commenting

For general comments on a PR, it looks like you have to use the `/issue`
endpoint rather than `/pulls`, which requires commit/other
review-specific target details.

This matches the endpoint used in `backport-reminder.yml`.

* Remove Backport Reminder workflow

This is noisy (even when adding multiple labels, individual comments per
label are generated), and likely no longer needed: we haven't had this
work in a long time due to an expired GH token, and we now have better
automation for backport PR assignment.

Manual backport of 1c7fcdf.
@zalimeni zalimeni force-pushed the backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish branch from 1f00ccd to a8ca204 Compare July 20, 2023 15:59
@zalimeni zalimeni marked this pull request as ready for review July 20, 2023 15:59
@zalimeni zalimeni enabled auto-merge (squash) July 20, 2023 15:59
@zalimeni zalimeni disabled auto-merge July 20, 2023 15:59
@zalimeni zalimeni enabled auto-merge (squash) July 20, 2023 15:59
@zalimeni zalimeni merged commit 1ce20ea into release/1.15.x Jul 20, 2023
@zalimeni zalimeni deleted the backport/zalimeni/fix-backport-failure-pr-comments/enormously-composed-lionfish branch July 20, 2023 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants