Merge branch 'release/2.13.1'

Author: tassoevan

.travis.yml

@@ -20,23 +20,25 @@ matrix:
   - os: osx
     osx_image: xcode8.3
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo snap install snapcraft --classic; fi
-
-install:
-  - yarn
-
-script:
-  - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then export CSC_IDENTITY_AUTO_DISCOVERY=false; fi
-  - yarn release
-
 branches:
   only:
     - master
     - develop
-    - hotfix
+    - /^hotfix\/.*$/
+    - /^release\/.*$/
 
 notifications:
   email:
     on_success: never
     on_failure: change
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo snap install snapcraft --classic; fi
+
+install:
+  - yarn
+  - yarn list
+
+script:
+  - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then export CSC_IDENTITY_AUTO_DISCOVERY=false; fi
+  - yarn release

HISTORY.md

@@ -1,3 +1,11 @@
+<a name="2.13.1"></a>
+## 2.13.1 (2018-08-30)
+
+
+Fixes for MacOS and Windows builds.
+
+
+
 <a name="2.13.0"></a>
 # 2.13.0 (2018-08-27)
 

appveyor.yml

@@ -1,39 +1,27 @@
-# build: off
-
 image: Visual Studio 2017
-
+environment:
+  nodejs_version: "8"
 platform:
   - x64
-
-branches:
-  only:
-    - master
-    - develop
-
 skip_tags: true
-
-environment:
-  nodejs_version: "8"
-
+shallow_clone: true
+clone_depth: 1
 cache:
   - "%LOCALAPPDATA%/Yarn"
   - node_modules -> package.json
-  - app/node_modules -> app/package.json
-
-shallow_clone: true
 
-clone_depth: 1
+branches:
+  only:
+    - master
+    - develop
+    - /^hotfix\/.*$/
+    - /^release\/.*$/
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - set CI=true
   - yarn
-
-test_script:
-  - node --version
-  - yarn --version
-  # - yarn test
-  # - yarn e2e
+  - yarn list
 
 build_script:
   - yarn release

electron-builder.json

@@ -1,5 +1,4 @@
 {
-  "appId": "chat.rocket",
   "files": [
     "app/**/*",
     "node_modules/**/*",
@@ -11,19 +10,38 @@
     "servers.json"
   ],
   "mac": {
-    "bundleVersion": "31",
-    "helperBundleId": "chat.rocket.electron.helper",
     "category": "public.app-category.productivity",
     "target": [
-      "default",
+      "dmg",
       "pkg",
+      "zip",
       "mas"
     ],
+    "icon": "build/icon.icns",
+    "bundleVersion": "33",
+    "helperBundleId": "chat.rocket.electron.helper",
+    "type": "distribution",
+    "appId": "chat.rocket",
     "artifactName": "rocketchat-${version}.${ext}"
   },
+  "dmg": {
+    "background": "build/background.png"
+  },
+  "pkg": {
+    "isRelocatable": false,
+    "overwriteAction": "upgrade"
+  },
   "mas": {
+    "entitlements": "build/entitlements.mas.plist",
+    "entitlementsInherit": "build/entitlements.mas.inherit.plist",
     "artifactName": "rocketchat-${version}-mas.${ext}"
   },
+  "win": {
+    "target": [
+      "nsis",
+      "appx"
+    ]
+  },
   "nsis": {
     "oneClick": false,
     "perMachine": false,
@@ -40,7 +58,7 @@
       "en-GB",
       "pt-BR"
     ],
-    "artifactName": "rocketchat-setup-${version}.${ext}"
+    "artifactName": "rocketchat-${version}-${arch}.${ext}"
   },
   "linux": {
     "desktop": {

Production.provisionprofile renamed to embedded.provisionprofile

@@ -2,7 +2,7 @@
   "name": "rocketchat",
   "productName": "Rocket.Chat",
   "description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "author": "Rocket.Chat Support <[email protected]>",
   "copyright": "© 2018, Rocket.Chat",
   "homepage": "https://rocket.chat",
@@ -52,8 +52,9 @@
     "istanbul": "^0.4.5",
     "minimist": "^1.2.0",
     "mocha": "^5.2.0",
-    "rollup": "^0.65.0",
+    "rollup": "^0.64.1",
     "rollup-plugin-istanbul": "^2.0.1",
+    "run-sequence": "^2.2.1",
     "spectron": "^3.8.0"
   },
   "devEngines": {

package.json

@@ -1,5 +1,5 @@
 name: rocketchat-desktop
-version: 2.13.0
+version: 2.14.0-develop
 summary: Rocket.Chat
 description: Rocket.Chat Native Cross-Platform Desktop Application via Electron.
 confinement: strict

snap/snapcraft.yaml

@@ -1,17 +1,18 @@
 'use strict';
 
 const gulp = require('gulp');
+const runSequence = require('run-sequence');
 const { build } = require('electron-builder');
 const config = require('../electron-builder.json');
 const { getEnvName } = require('./utils');
 
 const publish = getEnvName() !== 'production' ? 'never' : 'onTagOrDraft';
 gulp.task('release:darwin', () => build({ publish, x64: true, mac: [] }));
-gulp.task('release:win32', () => build({ publish, x64: true, win: [ 'nsis', 'appx' ] }));
+gulp.task('release:win32', () => build({ publish, x64: true, ia32: true, win: [ 'nsis', 'appx' ] }));
 gulp.task('release:linux', (cb) => {
     build({ publish, x64: true, linux: [] })
         .then(() => build({ publish, ia32: true, linux: config.linux.target.filter(target => target !== 'snap') }))
         .then(() => cb(), (error) => cb(error));
 });
 
-gulp.task('release', [ 'build-app', `release:${ process.platform }` ]);
+gulp.task('release', (cb) => runSequence('build-app', `release:${ process.platform }`, cb));

tasks/release.js

@@ -4384,9 +4384,9 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.65.0:
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.65.0.tgz#280db1252169b68fc3043028346b337dde453fba"
+rollup@^0.64.1:
+  version "0.64.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.64.1.tgz#9188ee368e5fcd43ffbc00ec414e72eeb5de87ba"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
@@ -4397,6 +4397,14 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-sequence@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.2.1.tgz#1ce643da36fd8c7ea7e1a9329da33fc2b8898495"
+  dependencies:
+    chalk "^1.1.3"
+    fancy-log "^1.3.2"
+    plugin-error "^0.1.2"
+
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"