Merge branch 'master' of github.com:wireapp/wire-desktop into about

* 'master' of github.com:wireapp/wire-desktop: fix: Ensure account limit to be 3 (#1049) chore(package): update webpack to version 3.8.0 (#1048) chore: Use node 8.7.0 for building (#1047)
wireapp · Oct 17, 2017 · 5a82355 · 5a82355
2 parents 15d5ce2 + e40ba34
commit 5a82355
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/electron/renderer/src/components/Sidebar.js b/electron/renderer/src/components/Sidebar.js
@@ -116,7 +116,7 @@ export default connect(
     accounts,
     currentAccentID: (accounts.find(account => account.visible) || {}).accentID,
     hasCreatedAccount: accounts.some(account => account.userID !== undefined),
-    hasReachedLimitOfAccounts: accounts.length === 3,
+    hasReachedLimitOfAccounts: accounts.length >= 3,
     isAddingAccount:
       accounts.length && accounts.some(account => account.userID === undefined),
     isContextMenuVisible: contextMenuState.isAccountContextMenuVisible,

diff --git a/linux.Jenkinsfile b/linux.Jenkinsfile
@@ -34,7 +34,7 @@ node('Linux_Node') {
     try {
       sh 'pip install -r requirements.txt'
       sh 'yarn global add grunt-cli'
-      def NODE = tool name: 'node-v8.0.0-linux-x64', type: 'nodejs'
+      def NODE = tool name: 'node-v8.7.0', type: 'nodejs'
       withEnv(['PATH+RUST=/home/jenkins/.cargo/bin',"PATH+NODE=${NODE}/bin"]) {
         sh 'node -v'
         sh 'npm install'

diff --git a/macOS.Jenkinsfile b/macOS.Jenkinsfile
@@ -36,7 +36,7 @@ node('master') {
     try {
       sh 'security unlock-keychain -p 123456 /Users/jenkins/Library/Keychains/login.keychain'
       sh 'pip install -r requirements.txt'
-      def NODE = tool name: 'node-v8.0.0-darwin-x64', type: 'nodejs'
+      def NODE = tool name: 'node-v8.7.0', type: 'nodejs'
       withEnv(['PATH+RUST=/Users/jenkins/.cargo/bin',"PATH+NODE=${NODE}/bin"]) {
         sh 'node -v'
         sh 'npm install'

diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "load-grunt-tasks": "3.5.2",
     "prettier": "1.7.4",
     "style-loader": "0.19.0",
-    "webpack": "3.7.1"
+    "webpack": "3.8.0"
   },
   "dependencies": {
     "debug": "3.1.0"

diff --git a/windows.Jenkinsfile b/windows.Jenkinsfile
@@ -27,7 +27,7 @@ node('Windows_Node') {
   stage('Build') {
     try {
       bat 'pip install -r requirements.txt'
-      def NODE = tool name: 'node-v8.0.0-windows-x64', type: 'nodejs'
+      def NODE = tool name: 'node-v8.7.0', type: 'nodejs'
       withEnv(["PATH+NODE=${NODE}",'npm_config_target_arch=ia32','wire_target_arch=ia32']) {
         bat 'node -v'
         bat returnStatus: true, script: 'rustc --version'
@@ -66,7 +66,7 @@ node('Windows_Node') {
 
   stage('Build installer') {
     try {
-      def NODE = tool name: 'node-v8.0.0-windows-x64', type: 'nodejs'
+      def NODE = tool name: 'node-v8.7.0', type: 'nodejs'
       withEnv(["PATH+NODE=${NODE}",'npm_config_target_arch=ia32','wire_target_arch=ia32']) {
         if(production) {
           bat 'grunt create-windows-installer:prod'