From d6edc7dea303403c83bd6a968e33d3fb2710248f Mon Sep 17 00:00:00 2001 From: Michele Degges Date: Tue, 31 May 2022 10:39:06 -0700 Subject: [PATCH 1/2] Update version string on active release branches *Background* Pushing per-commit dev images to the `hashicorppreview` dockerhub org was introduced in https://github.com/hashicorp/consul/pull/13084. On merges to a release branch in the format `release/$MAJOR.$MINOR.x`, artifacts including docker images are built, tagged, and pushed to `hashicorppreview` under the tags `$VERSION` and `$VERSION-$GITCOMMIT`. [Note that `$VERSION` includes the prerelease string as a suffix.] The team has automation that runs to pull down these images and run tests against them. *In this PR* This PR suggests changing the `$VERSION` string (and docker tag) on the active release branches [1.10.x, 1.11.x, 1.12.x] to mirror the release branch naming convention, `$MAJOR.$MINOR.x`. Since the tip of the release branch contains the latest patch code changes, using a `.x` instead of pointing to a specific patch version is what we've adopted for release branch naming, and would like to adopt for dev_tags. The version string is updated prior to building for a release, so this should have no adverse effects. *Examples* `hashicorppreview/consul:1.13.0-dev` will become `hashicorppreview/consul:1.13.x-dev` `hashicorppreview/consul:1.13.0-dev-364758ef2f50519cb12585f7148fdcc8f213f27d` will become `hashicorppreview/consul:1.13.x-dev-364758ef2f50519cb12585f7148fdcc8f213f27d` --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 827f5185007..52df1aaaa9d 100644 --- a/version/version.go +++ b/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by github.com/hashicorp/go-version // for tests to work. - Version = "1.11.3" + Version = "1.11.x" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release From 2f46a55126a50b3c8b7ac27c47cca95b4a49dbb8 Mon Sep 17 00:00:00 2001 From: Michele Degges Date: Tue, 31 May 2022 11:05:04 -0700 Subject: [PATCH 2/2] Update version.go --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 52df1aaaa9d..341b9305ea0 100644 --- a/version/version.go +++ b/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by github.com/hashicorp/go-version // for tests to work. - Version = "1.11.x" + Version = "1.11" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release