Bump version to 0.61.0-develop

pull/9260/head
Rodrigo Nascimento 8 years ago
parent 27f0c10653
commit e2deea224d
No known key found for this signature in database
GPG Key ID: CFCE33B7B01AC335
  1. 2
      .docker/Dockerfile
  2. 2
      .sandstorm/sandstorm-pkgdef.capnp
  3. 6
      .scripts/set-version.js
  4. 2
      .travis/snap.sh
  5. 2
      package.json
  6. 2
      packages/rocketchat-lib/rocketchat.info

@ -1,6 +1,6 @@
FROM rocketchat/base:8 FROM rocketchat/base:8
ENV RC_VERSION 0.60.0 ENV RC_VERSION 0.61.0-develop
MAINTAINER buildmaster@rocket.chat MAINTAINER buildmaster@rocket.chat

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

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

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

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

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

Loading…
Cancel
Save