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.

Sign up for GitHub

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

Jump to bottom

Backport of build(docker): always publish full and minor version tags for dev images into release/1.14.x #19279

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Backport of build(docker): always publish full and minor version tags for dev images into release/1.14.x #19279

merged 1 commit into from
Oct 18, 2023

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.14.

🚨

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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/fix-docker-dev-tag/randomly-unique-dassie branch from ae50660 to fe11d49 Compare October 18, 2023 19:40
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/fix-docker-dev-tag/randomly-unique-dassie branch from fe11d49 to ae50660 Compare October 18, 2023 19:40
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 18, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Oct 18, 2023
View reviewed changes
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

@vercel vercel bot temporarily deployed to Preview – consul October 18, 2023 19:45 Inactive
@hc-github-team-consul-core @DanStough
Backport of build(docker): always publish full and minor version tags…
31bc62a 
… for dev images into release/1.17.x (#19282)

backport of commit c6bb4a5

Co-authored-by: DanStough <dan.stough@hashicorp.com>
@DanStough DanStough force-pushed the backport/dans/fix-docker-dev-tag/randomly-unique-dassie branch from b97dd16 to 31bc62a Compare October 18, 2023 20:56
@DanStough DanStough marked this pull request as ready for review October 18, 2023 20:56
@DanStough DanStough requested a review from a team October 18, 2023 20:56
@DanStough DanStough requested a review from a team as a code owner October 18, 2023 20:56
@DanStough DanStough requested review from modrake and emilymianeil and removed request for a team October 18, 2023 20:56
@DanStough DanStough merged commit 0898aa1 into release/1.14.x Oct 18, 2023
85 checks passed
@DanStough DanStough deleted the backport/dans/fix-docker-dev-tag/randomly-unique-dassie branch October 18, 2023 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@DanStough DanStough Awaiting requested review from DanStough

@modrake modrake Awaiting requested review from modrake

@emilymianeil emilymianeil Awaiting requested review from emilymianeil

Assignees

@DanStough DanStough

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @hashicorp-cla @github-team-consul-core-pr-approver @DanStough