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 Set concurrency for workflows into release/1.16.x #18594

Conversation

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

Backport

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

🚨

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

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


Description

  • This adds concurrency to the bigger workflows that we run.
  • These should only work on 'push' style actions (ie pushing a commit or creating a PR).
  • Merges to main as pushes are ok as they are done as part of the merge process and not developers pushing commits over and over.
  • I've skipped all the smaller workflows because those will need to be cleaned up/merged together soon(tm)
  • It will limit 1 workflow run per branch at a time and will cancel current runs of other workflows.

Testing & Reproduction steps

  • try doing 2 commits at the same time and the 1st set of workflows should be cancelled.

You can see in the go-tests below how they were cancelled because I pushed a 2nd commit.

https://github.com/hashicorp/consul/actions/runs/5954040559

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/gha-concurrency/finally-exciting-filly branch 2 times, most recently from ea2dda1 to d777aa4 Compare August 28, 2023 16:06
@github-actions github-actions bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Aug 28, 2023
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

@curtbushko curtbushko marked this pull request as ready for review September 18, 2023 18:56
@curtbushko
Copy link
Contributor

Already backported manually.

@curtbushko curtbushko closed this Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants