From bfd0dcc3d243320600a0f0a37e25eff6f4018e07 Mon Sep 17 00:00:00 2001
From: Michele Degges <mdeggies@gmail.com>
Date: Tue, 21 Jun 2022 15:59:20 -0700
Subject: [PATCH 1/2] Dev tag update for 1.12.x

---
 .github/workflows/build.yml | 13 +++++++++++--
 .release/ci.hcl             |  1 +
 version/version.go          |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d98214c31d1b..adf2780e5018 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
       # Push events on the main branch
       - main
       - release/1.12.x
+      - dev-tags-1.12.x
 
 env:
   PKG_NAME: consul
@@ -243,6 +244,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
+      # This naming convention will be used ONLY for per-commit dev images
+      - name: Set docker dev tag
+        run: |
+          version="${{ env.version }}"
+          echo "dev_tag=${version%.*}-dev" >> $GITHUB_ENV
+
       - name: Docker Build (Action)
         uses: hashicorp/actions-docker-build@v1
         with:
@@ -253,8 +262,8 @@ jobs:
             docker.io/hashicorp/${{env.repo}}:${{env.version}}
             public.ecr.aws/hashicorp/${{env.repo}}:${{env.version}}
           dev_tags: |
-            docker.io/hashicorppreview/${{ env.repo }}:${{ env.version }}
-            docker.io/hashicorppreview/${{ env.repo }}:${{ env.version }}-${{ github.sha }}
+            docker.io/hashicorppreview/${{ env.repo }}:${{ env.dev_tag }}
+            docker.io/hashicorppreview/${{ env.repo }}:${{ env.dev_tag }}-${{ github.sha }}
           smoke_test: .github/scripts/verify_docker.sh v${{ env.version }}
 
   build-docker-redhat:
diff --git a/.release/ci.hcl b/.release/ci.hcl
index e508bac4aa7f..97f16ebfcbeb 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -16,6 +16,7 @@ project "consul" {
       "release/1.10.x",
       "release/1.11.x",
       "release/1.12.x",
+      "dev-tags-1.12.x"
     ]
   }
 }
diff --git a/version/version.go b/version/version.go
index a878fdaefd8b..8788987d05f1 100644
--- a/version/version.go
+++ b/version/version.go
@@ -10,11 +10,11 @@ var (
 	// compiler.
 	GitCommit string
 
-	// The main version number that is being run at the moment.
+	// The next version number that will be released in this series.
 	//
 	// Version must conform to the format expected by github.com/hashicorp/go-version
 	// for tests to work.
-	Version = "1.12.0"
+	Version = "1.12.3"
 
 	// https://semver.org/#spec-item-10
 	VersionMetadata = ""

From 7840b18488928af6c04092ecab79f3722b373bde Mon Sep 17 00:00:00 2001
From: Michele Degges <mdeggies@gmail.com>
Date: Tue, 21 Jun 2022 17:17:05 -0700
Subject: [PATCH 2/2] Remove test trigger

---
 .github/workflows/build.yml | 1 -
 .release/ci.hcl             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index adf2780e5018..adad03fbc74d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,6 @@ on:
       # Push events on the main branch
       - main
       - release/1.12.x
-      - dev-tags-1.12.x
 
 env:
   PKG_NAME: consul
diff --git a/.release/ci.hcl b/.release/ci.hcl
index 97f16ebfcbeb..e508bac4aa7f 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -16,7 +16,6 @@ project "consul" {
       "release/1.10.x",
       "release/1.11.x",
       "release/1.12.x",
-      "dev-tags-1.12.x"
     ]
   }
 }