From 301880750737f1345e641d5718617e07098195c3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 15 May 2017 18:39:44 -0300
Subject: [PATCH] Bump version to 0.56.0
---
.docker/Dockerfile | 2 +-
.sandstorm/sandstorm-pkgdef.capnp | 2 +-
.scripts/set-version.js | 94 +++++++++++++++++--
.travis/snap.sh | 2 +-
HISTORY.md | 118 ++++++++++++++++--------
package.json | 2 +-
packages/rocketchat-lib/rocketchat.info | 2 +-
7 files changed, 168 insertions(+), 54 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index cb95bd4beb5..4729c9a9f8d 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
FROM rocketchat/base:4
-ENV RC_VERSION 0.56.0-rc.7
+ENV RC_VERSION 0.56.0
MAINTAINER buildmaster@rocket.chat
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 4b8265b6502..7d4ff40e2bf 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
appVersion = 62, # Increment this for every release.
- appMarketingVersion = (defaultText = "0.56.0-rc.7"),
+ appMarketingVersion = (defaultText = "0.56.0"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
diff --git a/.scripts/set-version.js b/.scripts/set-version.js
index 5b1f9054ae9..c1e1264ae46 100644
--- a/.scripts/set-version.js
+++ b/.scripts/set-version.js
@@ -19,17 +19,16 @@ try {
console.error('no root package.json found');
}
+const files = [
+ './package.json',
+ './.sandstorm/sandstorm-pkgdef.capnp',
+ './.travis/snap.sh',
+ './.docker/Dockerfile',
+ './packages/rocketchat-lib/rocketchat.info'
+];
+
class Actions {
static release_rc() {
- const files = [
- './package.json',
- './.sandstorm/sandstorm-pkgdef.capnp',
- './.travis/snap.sh',
- './.docker/Dockerfile',
- './packages/rocketchat-lib/rocketchat.info'
- ];
-
-
function processVersion(version) {
// console.log('Updating files to version ' + version);
@@ -103,11 +102,88 @@ class Actions {
}
});
}
+
+ static release_gm() {
+ function processVersion(version) {
+ // console.log('Updating files to version ' + version);
+
+ files.forEach(function(file) {
+ const data = fs.readFileSync(file, 'utf8');
+
+ fs.writeFileSync(file, data.replace(pkgJson.version, version), 'utf8');
+ });
+
+ execSync('conventional-changelog --config .github/changelog.js -i HISTORY.md -s');
+ // TODO improve HISTORY generation for GM
+
+ inquirer.prompt([{
+ type: 'confirm',
+ message: 'Commit files?',
+ name: 'commit'
+ }]).then(function(answers) {
+ if (!answers.commit) {
+ return;
+ }
+
+ git.status((error, status) => {
+ inquirer.prompt([{
+ type: 'checkbox',
+ message: 'Select files to commit?',
+ name: 'files',
+ choices: status.files.map(file => { return {name: `${ file.working_dir } ${ file.path }`, checked: true}; })
+ }]).then(function(answers) {
+ if (answers.files.length) {
+ git.add(answers.files.map(file => file.slice(2)), () => {
+ git.commit(`Bump version to ${ version }`, () => {
+ inquirer.prompt([{
+ type: 'confirm',
+ message: `Add tag ${ version }?`,
+ name: 'tag'
+ }]).then(function(answers) {
+ if (answers.tag) {
+ // TODO: Add annotated tag
+ git.addTag(version);
+ // TODO: Push
+ // Useg GitHub api to create the release with history
+ }
+ });
+ });
+ });
+ }
+ });
+ });
+ });
+ }
+
+
+ inquirer.prompt([{
+ type: 'list',
+ message: `The current version is ${ pkgJson.version }. Update to version:`,
+ name: 'version',
+ choices: [
+ semver.inc(pkgJson.version, 'patch'),
+ 'custom'
+ ]
+ }]).then(function(answers) {
+ if (answers.version === 'custom') {
+ inquirer.prompt([{
+ name: 'version',
+ message: 'Enter your custom version:'
+ }]).then(function(answers) {
+ processVersion(answers.version);
+ });
+ } else {
+ processVersion(answers.version);
+ }
+ });
+ }
}
git.status((err, status) => {
if (status.current === 'release-candidate') {
Actions.release_rc();
+ } else if (status.current === 'master') {
+ Actions.release_gm();
} else {
console.log(`No release action for branch ${ status.current }`);
}
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 3e8ab2da3fa..fe55eb907ec 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
- RC_VERSION=0.56.0-rc.7
+ RC_VERSION=0.56.0
fi
echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index e6f16517af6..4e732d59c73 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,20 +1,83 @@
-<a name="0.56.0-rc.7"></a>
-# 0.56.0-rc.7 (2017-05-15)
+<a name="0.56.0"></a>
+# 0.56.0 (2017-05-15)
+
+### New Features
+
+- [#6881](https://github.com/RocketChat/Rocket.Chat/pull/6881) Add a pointer cursor to message images
+- [#6615](https://github.com/RocketChat/Rocket.Chat/pull/6615) Add a setting to not run outgoing integrations on message edits
+- [#5373](https://github.com/RocketChat/Rocket.Chat/pull/5373) Add option on Channel Settings: Hide Notifications and Hide Unread Room Status ([#2707](https://github.com/RocketChat/Rocket.Chat/issue/2707), [#2143](https://github.com/RocketChat/Rocket.Chat/issue/2143))
+- [#6807](https://github.com/RocketChat/Rocket.Chat/pull/6807) create a method 'create token'
+- [#6827](https://github.com/RocketChat/Rocket.Chat/pull/6827) Make channels.info accept roomName, just like groups.info
+- [#6797](https://github.com/RocketChat/Rocket.Chat/pull/6797) Option to allow to signup as anonymous
+- [#6722](https://github.com/RocketChat/Rocket.Chat/pull/6722) Remove lesshat
+- [#6842](https://github.com/RocketChat/Rocket.Chat/pull/6842) Snap ARM support
+- [#6692](https://github.com/RocketChat/Rocket.Chat/pull/6692) Use tokenSentVia parameter for clientid/secret to token endpoint
+- [#6940](https://github.com/RocketChat/Rocket.Chat/pull/6940) Add SMTP settings for Protocol and Pool
+- [#6938](https://github.com/RocketChat/Rocket.Chat/pull/6938) Improve CI/Docker build/release
+- [#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953) Show info about multiple instances at admin page
### Bug Fixes
+- [#6845](https://github.com/RocketChat/Rocket.Chat/pull/6845) Added helper for testing if the current user matches the params
+- [#6737](https://github.com/RocketChat/Rocket.Chat/pull/6737) Archiving Direct Messages
+- [#6734](https://github.com/RocketChat/Rocket.Chat/pull/6734) Bug with incoming integration (0.55.1)
+- [#6768](https://github.com/RocketChat/Rocket.Chat/pull/6768) CSV importer: require that there is some data in the zip, not ALL data
+- [#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) emoji picker exception
+- [#6721](https://github.com/RocketChat/Rocket.Chat/pull/6721) Fix Caddy by forcing go 1.7 as needed by one of caddy's dependencies
+- [#6798](https://github.com/RocketChat/Rocket.Chat/pull/6798) Fix iframe wise issues
+- [#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704) Fix message types
+- [#6760](https://github.com/RocketChat/Rocket.Chat/pull/6760) Hides nav buttons when selecting own profile
+- [#6747](https://github.com/RocketChat/Rocket.Chat/pull/6747) Incorrect error message when creating channel
+- [#6800](https://github.com/RocketChat/Rocket.Chat/pull/6800) Quoted and replied messages not retaining the original message's alias
+- [#6796](https://github.com/RocketChat/Rocket.Chat/pull/6796) REST API user.update throwing error due to rate limiting
+- [#6767](https://github.com/RocketChat/Rocket.Chat/pull/6767) Search full name on client side
+- [#6758](https://github.com/RocketChat/Rocket.Chat/pull/6758) Sort by real name if use real name setting is enabled
+- [#6861](https://github.com/RocketChat/Rocket.Chat/pull/6861) start/unstar message
+- [#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896) Users status on main menu always offline
+- [#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923) Not showing unread count on electron app’s icon
+- [#6939](https://github.com/RocketChat/Rocket.Chat/pull/6939) Compile CSS color variables
+- [#6935](https://github.com/RocketChat/Rocket.Chat/pull/6935) Error when trying to show preview of undefined filetype
+- [#6955](https://github.com/RocketChat/Rocket.Chat/pull/6955) Remove spaces from env PORT and INSTANCE_IP
- [#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) make channels.create API check for create-c
+<details>
+<summary>Others</summary>
+
+- [#5986](https://github.com/RocketChat/Rocket.Chat/pull/5986) Anonymous use
+- [#6368](https://github.com/RocketChat/Rocket.Chat/pull/6368) Breaking long URLS to prevent overflow
+- [#6671](https://github.com/RocketChat/Rocket.Chat/pull/6671) Convert Katex Package to Js
+- [#6780](https://github.com/RocketChat/Rocket.Chat/pull/6780) Convert Mailer Package to Js
+- [#6694](https://github.com/RocketChat/Rocket.Chat/pull/6694) Convert markdown to js
+- [#6689](https://github.com/RocketChat/Rocket.Chat/pull/6689) Convert Mentions-Flextab Package to Js
+- [#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781) Convert Message-Star Package to js
+- [#6688](https://github.com/RocketChat/Rocket.Chat/pull/6688) Convert Oembed Package to Js
+- [#6672](https://github.com/RocketChat/Rocket.Chat/pull/6672) Converted rocketchat-lib 3
+- [#6654](https://github.com/RocketChat/Rocket.Chat/pull/6654) disable proxy configuration
+- [#6816](https://github.com/RocketChat/Rocket.Chat/pull/6816) LingoHub based on develop
+- [#6715](https://github.com/RocketChat/Rocket.Chat/pull/6715) LingoHub based on develop
+- [#6703](https://github.com/RocketChat/Rocket.Chat/pull/6703) LingoHub based on develop
+- [#6858](https://github.com/RocketChat/Rocket.Chat/pull/6858) Meteor update
+- [#6706](https://github.com/RocketChat/Rocket.Chat/pull/6706) meteor update to 1.4.4
+- [#6804](https://github.com/RocketChat/Rocket.Chat/pull/6804) Missing useful fields in admin user list [#5110](https://github.com/RocketChat/Rocket.Chat/issue/5110)
+- [#6593](https://github.com/RocketChat/Rocket.Chat/pull/6593) Rocketchat lib2
+</details>
+
+
-<a name="0.56.0-rc.6"></a>
-# 0.56.0-rc.6 (2017-05-12)
+<details>
+<summary>Details</summary>
+## 0.56.0-rc.7 (2017-05-15)
-<a name="0.56.0-rc.5"></a>
-# 0.56.0-rc.5 (2017-05-11)
+### Bug Fixes
+
+- [#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) make channels.create API check for create-c
+
+
+## 0.56.0-rc.5 (2017-05-11)
### Bug Fixes
@@ -23,9 +86,7 @@
- [#6955](https://github.com/RocketChat/Rocket.Chat/pull/6955) Remove spaces from env PORT and INSTANCE_IP
-
-<a name="0.56.0-rc.4"></a>
-# 0.56.0-rc.4 (2017-05-11)
+## 0.56.0-rc.4 (2017-05-11)
### New Features
@@ -33,9 +94,7 @@
- [#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953) Show info about multiple instances at admin page
-
-<a name="0.56.0-rc.3"></a>
-# 0.56.0-rc.3 (2017-05-10)
+## 0.56.0-rc.3 (2017-05-10)
### New Features
@@ -49,9 +108,7 @@
- [#6939](https://github.com/RocketChat/Rocket.Chat/pull/6939) Compile CSS color variables
-
-<a name="0.56.0-rc.2"></a>
-# 0.56.0-rc.2 (2017-05-09)
+## 0.56.0-rc.2 (2017-05-09)
### Bug Fixes
@@ -59,9 +116,7 @@
- [#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923) Not showing unread count on electron app’s icon
-
-<a name="0.56.0-rc.1"></a>
-# 0.56.0-rc.1 (2017-05-05)
+## 0.56.0-rc.1 (2017-05-05)
### Bug Fixes
@@ -69,9 +124,7 @@
- [#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896) Users status on main menu always offline
-
-<a name="0.56.0-rc.0"></a>
-# 0.56.0-rc.0 (2017-05-04)
+## 0.56.0-rc.0 (2017-05-04)
### New Features
@@ -128,32 +181,17 @@
- [#6593](https://github.com/RocketChat/Rocket.Chat/pull/6593) Rocketchat lib2
</details>
+</details>
-<a name="0.56.0-develop"></a>
-# 0.56.0-develop (2017-04-18)
-
-### New Features
-
-- [#6615](https://github.com/RocketChat/Rocket.Chat/pull/6615) Add a setting to not run outgoing integrations on message edits
-- [#6692](https://github.com/RocketChat/Rocket.Chat/pull/6692) Use tokenSentVia parameter for clientid/secret to token endpoint
+<a name="0.55.1"></a>
+## 0.55.1 (2017-04-19)
### Bug Fixes
-- [#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) emoji picker exception
-- [#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) emoji picker exception
-- [#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704) Fix message types
-
-
-<details>
-<summary>Others</summary>
-
-- [#6703](https://github.com/RocketChat/Rocket.Chat/pull/6703) LingoHub based on develop
-- [#6706](https://github.com/RocketChat/Rocket.Chat/pull/6706) meteor update to 1.4.4
-</details>
-
+- [#6734](https://github.com/RocketChat/Rocket.Chat/pull/6734) Bug with incoming integration (0.55.1)
<a name="0.55.0"></a>
diff --git a/package.json b/package.json
index af213a53760..8a9b8c71e7e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "0.56.0-rc.7",
+ "version": "0.56.0",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 8f759b75e10..d9cac47d187 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "0.56.0-rc.7"
+ "version": "0.56.0"
}
--
GitLab