Merge pull request #9260 from RocketChat/develop-sync

Develop sync - Bump version to 0.61.0-develop

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.0-develop
+ENV RC_VERSION 0.61.0-develop
 
 MAINTAINER [email protected]
 

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.60.0-develop"),
+		appMarketingVersion = (defaultText = "0.61.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.scripts/set-version.js

@@ -55,11 +55,11 @@ git.status()
 	if (status.current === 'release-candidate') {
 		return semver.inc(pkgJson.version, 'prerelease', 'rc');
 	}
-	if (status.current === 'master') {
+	if (/release-\d+\.\d+\.\d+/.test(status.current)) {
 		return semver.inc(pkgJson.version, 'patch');
 	}
-	if (status.current === 'develop') {
-		return semver.inc(semver.inc(pkgJson.version, 'minor'), 'minor')+'-develop';
+	if (status.current === 'develop-sync') {
+		return semver.inc(pkgJson.version, 'minor') + '-develop';
 	}
 	return Promise.reject(`No release action for branch ${ status.current }`);
 })

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.0-develop
+    RC_VERSION=0.61.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.60.0-develop",
+	"version": "0.61.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

packages/rocketchat-lib/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "0.60.0-develop"
+	"version": "0.61.0-develop"
 }