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 Node16 to Node20 into release/1.2.x #489

Merged

Conversation

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

Backport

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

🚨

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:
@NicoletaPopoviciu
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-dataplane/merges: 409 Merge conflict []

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


Updating GitHub action versions to the latest TSCCR approved version. This should address Node16 deprecations.


Overview of commits

Copy link

hashicorp-cla-app bot commented May 9, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
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

Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@DanStough DanStough force-pushed the backport/nicoleta-node16/tightly-helpful-weasel branch from a1928ae to cfff9a8 Compare May 14, 2024 20:45
@DanStough DanStough added the pr/no-changelog This PR does not introduce a user-facing change that should be reflected in the changelog label May 14, 2024
@DanStough DanStough marked this pull request as ready for review May 14, 2024 20:46
@DanStough DanStough requested a review from a team May 14, 2024 20:46
@DanStough DanStough requested a review from a team as a code owner May 14, 2024 20:46
@DanStough DanStough requested review from curtbushko and claire-labry and removed request for a team May 14, 2024 20:46
Copy link
Contributor

@curtbushko curtbushko left a comment

Choose a reason for hiding this comment

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

👋

@DanStough DanStough merged commit 1e725ed into release/1.2.x May 14, 2024
38 checks passed
@DanStough DanStough deleted the backport/nicoleta-node16/tightly-helpful-weasel branch May 14, 2024 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-changelog This PR does not introduce a user-facing change that should be reflected in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants