Skip to content

Backport of ci: Add success jobs. make go-test-enterprise conditional. build-distros and go-tests trigger on push to main and release branches into release/1.15.x#16913

Merged
jmurret merged 6 commits into
release/1.15.xfrom
backport/jm/go-test-check/promptly-cuddly-akita
Apr 6, 2023
Merged

Backport of ci: Add success jobs. make go-test-enterprise conditional. build-distros and go-tests trigger on push to main and release branches into release/1.15.x#16913
jmurret merged 6 commits into
release/1.15.xfrom
backport/jm/go-test-check/promptly-cuddly-akita

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/go-test-check/promptly-cuddly-akita branch from f1ec303 to 5c574a8 Compare April 6, 2023 22:30
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/go-test-check/promptly-cuddly-akita branch 2 times, most recently from 8d6619a to 5c574a8 Compare April 6, 2023 22:30
Copy link
Copy Markdown
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

@github-actions github-actions Bot added the theme/contributing Additions and enhancements to community contributing materials label Apr 6, 2023
@jmurret jmurret marked this pull request as ready for review April 6, 2023 22:37
@jmurret jmurret merged commit 3c35238 into release/1.15.x Apr 6, 2023
@jmurret jmurret deleted the backport/jm/go-test-check/promptly-cuddly-akita branch April 6, 2023 23:20
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants