search

hashicorp / consul-k8s

First-class support for Consul Service Mesh on Kubernetes
https://www.consul.io/docs/k8s
Mozilla Public License 2.0
668 stars 321 forks source link

Backport of [NET-11150] ci: fix conditional skip and add safeguard into release/1.5.x #4367

Closed hc-github-team-consul-core closed 3 weeks ago

hc-github-team-consul-core commented 3 weeks ago

Backport

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

:rotating_light:

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

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

Adopt a third-party action to avoid script bugs, and to fix a current issue where the script fails to detect all changes when processing push events on PR branches.

Adapted from hashicorp/consul-dataplane#637. See that PR for testing details and background context.

How I've tested this PR

See hashicorp/consul-dataplane#637 and conditional skip output in this PR's checks.

How I expect reviewers to test this PR

👀

Checklist

Overview of commits - 93e8afef098fa123eead5482ce6cba22ecf44c07
hashicorp-cla-app[bot] commented 3 weeks ago

CLA assistant check
All committers have signed the CLA.

hashicorp-cla-app[bot] commented 3 weeks ago

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.