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 build(docker): always publish full and minor version tags for dev images into release/1.15.x #19280

Merged

Conversation

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

Backport

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

🚨

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:
@DanStough
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

Always publishing full and minor-only tag versions. This accomplishes two goals:

For long-running release branches, .x, always publish a minor-only tag so that tests use the latest version (e.g. 1.17-dev)
For point release branches, .0, always publish the full version so we can fix this for testing purposes (e.g. 1.17.0)

Links

Similar to hashicorp/consul-dataplane#306


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Oct 18, 2023

CLA assistant check
All committers have signed the CLA.

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

@DanStough DanStough force-pushed the backport/dans/fix-docker-dev-tag/merely-sound-emu branch from 174dab1 to cae6f41 Compare October 18, 2023 20:45
@DanStough DanStough marked this pull request as ready for review October 18, 2023 20:45
@DanStough DanStough requested a review from a team October 18, 2023 20:45
@DanStough DanStough requested a review from a team as a code owner October 18, 2023 20:45
@DanStough DanStough requested review from dekimsey and claire-labry and removed request for a team October 18, 2023 20:45
… for dev images into release/1.17.x (#19282)

backport of commit c6bb4a5

Co-authored-by: DanStough <[email protected]>
@DanStough DanStough force-pushed the backport/dans/fix-docker-dev-tag/merely-sound-emu branch from cae6f41 to 1177043 Compare October 18, 2023 20:51
@DanStough DanStough merged commit 1bc046c into release/1.15.x Oct 18, 2023
83 checks passed
@DanStough DanStough deleted the backport/dans/fix-docker-dev-tag/merely-sound-emu branch October 18, 2023 21:07
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.

4 participants