Merge branch 'release' into developv5.6.0-beta.5

5 files changed, 8 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 56fc094e4..d5f1dd0c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ script:
   - |
     if [ $TRAVIS_BRANCH == "release" ]; then
       echo "Building..."
-      travis_retry travis_wait 100 npm run build 
+      travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null
     fi
   - |
     if [ $TRAVIS_BRANCH == "nightly" ]; then
diff --git a/appveyor.yml b/appveyor.yml
index b09759a42..2f5299dd9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,3 +31,9 @@ for:
     message: /trigger AppVeyor nightly build/
   build_script:
     - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
+-
+  branches:
+    only:
+      - release
+  build_script:
+    - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi
diff --git a/electron-builder.yml b/electron-builder.yml
index 86349ba6b..f43e33950 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -18,8 +18,6 @@ mac:
     NSMicrophoneUsageDescription: "This app requires camera access for video messaging services."
     NSCameraUsageDescription: "This app requires microphone access for audio messaging services."
 
-afterSign: ./build-helpers/notarize.js
-
 dmg:
   background: ./build-helpers/images/dmgInstaller.tiff
   icon: ./build-helpers/images/icon.icns
diff --git a/package.json b/package.json
index 93e68bbbc..9705475be 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.0-nightly.1",
+  "version": "5.6.0-beta.4",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/recipes b/recipes
-Subproject 5c2f5bdb4edca04d8466c94091c232655ba089f
+Subproject c40fae916884a1754cec8d3ec28b5cdfc7e5370