Skip to content

Backport of Updating GitHub action versions to the latest TSCCR approved version into release/1.1.x#3995

Merged
DanStough merged 2 commits intorelease/1.1.xfrom
backport/nicoleta-node16/poorly-intent-monster
May 16, 2024
Merged

Backport of Updating GitHub action versions to the latest TSCCR approved version into release/1.1.x#3995
DanStough merged 2 commits intorelease/1.1.xfrom
backport/nicoleta-node16/poorly-intent-monster

Conversation

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

Backport

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

🚨

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

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


Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app bot commented May 15, 2024

CLA assistant check
All committers have signed the CLA.

@hashicorp-cla-app
Copy link
Copy Markdown

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/poorly-intent-monster branch from e0a7be3 to dafdd33 Compare May 15, 2024 20:00
@DanStough DanStough marked this pull request as ready for review May 15, 2024 20:01
@DanStough DanStough merged commit 96f1d49 into release/1.1.x May 16, 2024
@DanStough DanStough deleted the backport/nicoleta-node16/poorly-intent-monster branch May 16, 2024 14:31
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.

3 participants