release-3.7 (#2327)

.copyconfigrc.js

@@ -1,15 +1,20 @@
 const pkg = require('./package.json');
-const path = require('path');
 
-const logoSource = path.join(pkg.name, 'content', 'image', 'logo');
-const repositoryUrl = pkg.dependencies['wire-web-config-default'];
+const contentSource = `${pkg.name}/content`;
+const imageSource = `${contentSource}/image`;
+const macOsSource = `${contentSource}/macos`;
+
+const configurationEntry = `wire-web-config-default-${process.env.BUILD_ENV !== 'internal' ? 'production' : 'internal'}`;
+const repositoryUrl = pkg.dependencies[configurationEntry];
 
 module.exports = {
   files: {
-    [path.join(logoSource, '32x32.png')]: 'resources/icons/32x32.png',
-    [path.join(logoSource, '256x256.png')]: ['resources/icons/256x256.png', 'electron/img/wire.256.png'],
-    [path.join(logoSource, 'wire.icns')]: 'resources/macos/wire.icns',
-    [path.join(logoSource, 'wire.ico')]: 'electron/img/wire.ico',
+    [`${imageSource}/**`]: 'electron/img/',
+    [`${macOsSource}/**`]: 'resources/macos/',
+    [`${imageSource}/logo/256x256.png`]: ['resources/icons/256x256.png', 'electron/img/logo.256.png'],
+    [`${imageSource}/logo/32x32.png`]: 'resources/icons/32x32.png',
+    [`${imageSource}/logo/logo.ico`]: 'electron/img/logo.ico',
+    [`${pkg.name}/.env.defaults`]: '.env.defaults',
   },
   repositoryUrl,
 }

.gitignore

@@ -7,7 +7,9 @@
 *.pkg
 /.idea
 /config
+/electron/coverage
 /electron/dist
+/electron/instrumented-code
 /electron/node_modules
 /electron/renderer/dist
 /keys
@@ -16,3 +18,10 @@
 app.asar
 node_modules
 Wire*.zip
+
+# Configuration imported from https://github.com/wireapp/wire-web-config-wire/
+.env.defaults
+electron/img/
+!electron/img/taskbar.overlay.png
+resources
+!resources/macos/entitlements/child.plist

.prettierignore

@@ -1,3 +1,4 @@
 /config
+instrumented-code
 package.json
 package-lock.json

.travis.yml

@@ -59,10 +59,11 @@ notifications:
 branches:
   only:
     - master
+    - staging
 
 after_success:
 - |
   if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then
-    yarn global add @wireapp/changelog-bot@2.1.0
+    yarn global add @wireapp/changelog-bot@2.2.1
     wire-changelog-bot -e "${WIRE_WEBAPP_BOT_EMAIL}" -p "${WIRE_WEBAPP_BOT_PASSWORD}" -c "46b53eba-65da-4bdc-b521-2467b96e8841"
   fi