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.1.x #639

Conversation

hc-github-team-consul-core

Backport

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

🚨

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

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


Fix CI skip workflow by adopting tj-actions/changed-files (used by several other hashicorp repos) and putting in safeguards to avoid false negatives on changed files due to inappropriate workflow triggers.

Reproduced bug (skipped checks on Dockerfile change): https://github.com/hashicorp/consul-dataplane/actions/runs/10984338025/job/30494819791?pr=630#step:3:14

Debugging 🧵 for posterity, which has some notes w/ more background on our previous script and potential gotchas: https://go.hashi.co/net-11150-debugging-slack

PRs for other repos:

Testing

pull_request retrieves changes between base and feature branch: https://github.com/hashicorp/consul-dataplane/actions/runs/11017376755/job/30595124657?pr=637#step:4:64

Prints both skippable and non-skippable files: https://github.com/hashicorp/consul-dataplane/actions/runs/11017376755/job/30595124657?pr=637#step:5:12

Skip test: https://github.com/hashicorp/consul-dataplane/actions/runs/11018306352/job/30598259268?pr=638#step:6:6

Safeguard test: https://github.com/hashicorp/consul-dataplane/actions/runs/11016637261/job/30592629656?pr=636#step:2:14

Simulated push with non-skippable commit (diff is just latest commit): https://github.com/hashicorp/consul-dataplane/actions/runs/11020606567/job/30605759628#step:3:62

Simulated push with skippable commit (diff is just latest commit): https://github.com/hashicorp/consul-dataplane/actions/runs/11020613882/job/30605785364#step:4:12


Overview of commits

Copy link

hashicorp-cla-app bot commented Sep 25, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/fix-ci-skip-action/correctly-helped-doberman branch from 5381687 to 6fefa9a Compare September 25, 2024 16:50
@zalimeni zalimeni marked this pull request as ready for review September 25, 2024 16:50
@zalimeni zalimeni requested a review from a team as a code owner September 25, 2024 16:50
@zalimeni zalimeni enabled auto-merge (squash) September 25, 2024 16:50
@zalimeni zalimeni merged commit fb33c0b into release/1.1.x Sep 25, 2024
30 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/fix-ci-skip-action/correctly-helped-doberman branch September 25, 2024 17:04
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