From 81c3f224248d1047576569bd5aabdd9461af25bf Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 10 Jan 2022 12:29:02 -0600 Subject: [PATCH 1/3] add new branches to on-master workflow --- .github/workflows/on-master.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml index 52c6d860c..4b1c9e8ca 100644 --- a/.github/workflows/on-master.yaml +++ b/.github/workflows/on-master.yaml @@ -3,6 +3,8 @@ name: Docker Build and publish to Github on: push: branches: + - statediff + - statediff-v2.0.0 - v1.10.15-statediff - v1.10.14-statediff - v1.10.13-statediff -- 2.45.2 From 0d2106c82a2ca748358af9edd770dc08a68dd922 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 10 Jan 2022 12:29:22 -0600 Subject: [PATCH 2/3] update version meta --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index d247c1c09..7b3ac06b0 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 10 // Minor version component of the current release - VersionPatch = 15 // Patch version component of the current release - VersionMeta = "statediff-0.0.29" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 10 // Minor version component of the current release + VersionPatch = 15 // Patch version component of the current release + VersionMeta = "statediff-2.0.0" // Version metadata to append to the version string ) // Version holds the textual version string. -- 2.45.2 From d8f46a60369d399292fef9bcb9d11abdb5a7c12e Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 10 Jan 2022 12:35:39 -0600 Subject: [PATCH 3/3] v2 major branch for 1.10.15 --- .github/workflows/on-master.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml index 4b1c9e8ca..f134c6e66 100644 --- a/.github/workflows/on-master.yaml +++ b/.github/workflows/on-master.yaml @@ -4,8 +4,8 @@ on: push: branches: - statediff - - statediff-v2.0.0 - - v1.10.15-statediff + - statediff-v2 + - v1.10.15-statediff-v2 - v1.10.14-statediff - v1.10.13-statediff - v1.10.12-statediff -- 2.45.2