Merge master into prod, release: v1.1.1

bitrise-io · Feb 22, 2016 · e0ce75b · e0ce75b
2 parents b785372 + 4594e74
commit e0ce75b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_scripts/get_version.go b/_scripts/get_version.go
@@ -23,7 +23,7 @@ func main() {
 		log.Fatalf("Failed to read version file: %s", err)
 	}
 	versionFileContent := string(versionFileBytes)
-	re := regexp.MustCompile(`const VERSION = "(?P<version>[0-9]+\.[0-9-]+)"`)
+	re := regexp.MustCompile(`const VERSION = "(?P<version>[0-9]+\.[0-9-]\.[0-9-]+)"`)
 	results := re.FindAllStringSubmatch(versionFileContent, -1)
 	versionStr := ""
 	for _, v := range results {

diff --git a/bitrise.yml b/bitrise.yml
@@ -146,7 +146,7 @@ workflows:
             fi
 
             current_version="$(go run _scripts/get_version.go -file "$version_file_path")"
-            bumped_version=$(ruby -e "splits='${current_version}'.split('.');major=splits[0];minor=splits[1];puts \"#{major}.#{minor.to_i.next}\"")
+            bumped_version=$(ruby -e "splits='${current_version}'.split('.');major=splits[0];minor=splits[1];patch=splits[2];puts \"#{major}.#{minor}.#{patch.to_i.next}\"")
 
             bash _scripts/set_version.sh "$version_file_path" "$bumped_version"
 

diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // VERSION ...
-const VERSION = "1.1"
+const VERSION = "1.1.1"