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 [NET-11150] ci: fix conditional skip and add safeguard into release/1.3.x #4365

Conversation

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

Backport

This PR is auto-generated from #4363 to be assessed for backporting due to the inclusion of the label backport/1.3.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:
@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

Copy link

hashicorp-cla-app bot commented Sep 25, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni marked this pull request as ready for review September 26, 2024 19:08
@zalimeni zalimeni enabled auto-merge (squash) September 26, 2024 19:09
Co-authored-by: Michael Zalimeni <[email protected]>
@zalimeni zalimeni force-pushed the backport/zalimeni/fix-ci-skip-action/likely-whole-weevil branch from 182419d to c78d109 Compare September 26, 2024 19:09
@zalimeni zalimeni enabled auto-merge (squash) September 26, 2024 19:09
@zalimeni zalimeni merged commit cafb53d into release/1.3.x Sep 26, 2024
49 of 50 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/fix-ci-skip-action/likely-whole-weevil branch September 26, 2024 21:33
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.

2 participants