6 files changed, 45 insertions, 10 deletions

diff --git a/.travis.yml b/.travis.yml
index 7579878b7..29d31c4a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
             - libxkbfile-dev
             - rpm
     - os: osx
-      if: branch = release
+      if: branch IN (nightly, release)
       osx_image: xcode11
 
 language: node_js
@@ -22,6 +22,7 @@ branches:
   only:
     - develop
     - release
+    - nightly
 cache: npm
 
 before_install:
@@ -34,6 +35,14 @@ before_script:
 script:
   - |
     if [ $TRAVIS_BRANCH == "release" ]; then
-      travis_retry travis_wait 100 npm run build
+      travis_retry travis_wait 100 npm run build 
+    fi
+  - |
+    if [ $TRAVIS_BRANCH == "nightly" ]; then
+      npm version prerelease --preid=nightly -m "%s [skip ci]"
+      travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
+      if [ $TRAVIS_OS_NAME == "osx" ]; then
+        git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
+        git push --quiet --set-upstream nightly HEAD:nightly >/dev/null 2>&1
+      fi
     fi
-
diff --git a/README.md b/README.md
index 4428babc1..1d68601a5 100644
--- a/README.md
+++ b/README.md
@@ -282,18 +282,33 @@ Deliverables will be available in the `out` folder.
 
 ### Release
 
+Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) that targets the `release` branch, then:
+
+```bash
+$ git checkout develop && git pull
+$ git checkout release
+$ git submodule update --remote --force
+$ git add .
+$ git commit -m "Update submodules"
+$ git merge --no-ff develop
+$ git push
+```
+
+Once the draft release assets are uploaded (13 assets), publish the release. The last commit of the `release` branch will be tagged. You can then merge `release` into `master` and back into `develop` if needed.
+
+#### Nightly
+
 ```bash
 $ git checkout develop && git pull
+$ git checkout nightly
 $ git submodule update --remote --force
 $ git add .
 $ git commit -m "Update submodules"
-$ git checkout master
 $ git merge --no-ff develop
-$ git tag v5.3.4-beta.4
-$ git push --tags
+$ git push
 ```
 
-When pushing a new tag, the CI builds will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release.
+The draft release and assets will be available in [getferdi/nightlies releases](https://github.com/getferdi/nightlies/releases). You need to manually publish the draft release as a pre-release for now.
 
 ## Contributors ✨
 
diff --git a/appveyor.yml b/appveyor.yml
index acdd94e13..d6e909f9c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,7 @@ version: build-{build}
 branches:
   only:
     - release
+    - nightly
 skip_tags: true
 skip_branch_with_pr: true
 
@@ -20,3 +21,13 @@ before_build:
 
 build_script:
   - appveyor-retry npm run build
+
+for:
+-
+  branches:
+    only:
+      - nightly
+  before_build:
+    - npm version prerelease --preid=nightly --no-git-tag-version
+  build_script:
+    - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index fc463f749..cb83808ad 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -2,7 +2,7 @@ const { notarize } = require("electron-notarize");
 
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-  if (electronPlatformName !== "darwin" || process.env.TRAVIS_BRANCH !== 'release') {
+  if (electronPlatformName !== "darwin" || (process.env.TRAVIS_BRANCH !== 'release' && process.env.TRAVIS_BRANCH !== 'nightly')) {
     return;
   }
 
diff --git a/package-lock.json b/package-lock.json
index 74e7d5a5c..0e43558a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.5.0",
+  "version": "5.5.1-nightly.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c92036da..281eb0712 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.5.0",
+  "version": "5.5.1-nightly.13",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",