Merge pull request #190 from vulcanize/v1.10.15-statediff-2.0.0

i-norden · web-flow · commit 5cd928706f98 · 2022-01-10T12:56:25.000-06:00
V1.10.15 statediff 2.0.0
diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml
@@ -3,7 +3,9 @@ name: Docker Build and publish to Github
 on:
   push:
     branches:
-      - v1.10.15-statediff
+      - statediff
+      - statediff-v2
+      - v1.10.15-statediff-v2
       - v1.10.14-statediff
       - v1.10.13-statediff
       - v1.10.12-statediff
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`24`		`- VersionMajor = 1 // Major version component of the current release`
`25`		`- VersionMinor = 10 // Minor version component of the current release`
`26`		`- VersionPatch = 15 // Patch version component of the current release`
`27`		`- VersionMeta = "statediff-0.0.29" // Version metadata to append to the version string`
	`24`	`+ VersionMajor = 1 // Major version component of the current release`
	`25`	`+ VersionMinor = 10 // Minor version component of the current release`
	`26`	`+ VersionPatch = 15 // Patch version component of the current release`
	`27`	`+ VersionMeta = "statediff-2.0.0" // Version metadata to append to the version string`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// Version holds the textual version string.`