Merge pull request RocketChat#333 from alexbrazier/feature/fix-build

Fix PR build

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     services:
     - docker
     script:
-    - docker run --rm -v ${PWD}:/project -e GH_TOKEN=${GH_TOKEN} rocketchat/electron.builder /bin/bash -l -c "npm install && npm run release -- --x64 --ia32"
+    - docker run --rm -v ${PWD}:/project -e GH_TOKEN=${GH_TOKEN} -e TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} rocketchat/electron.builder /bin/bash -l -c "npm install && npm run release -- --x64 --ia32"
   - os: osx
     osx_image: xcode7.3.1
     language: generic

package.json

@@ -61,7 +61,7 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "electron": "^1.4.15",
-    "electron-builder": "^11.7.0",
+    "electron-builder": "^12.0.3",
     "electron-mocha": "^3.3.0",
     "gulp": "^3.9.1",
     "gulp-batch": "^1.0.5",

scripts/travis-build.sh

@@ -11,6 +11,11 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   sleep 3
 fi
 
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+  # Disable macOS code signing on PR
+  export CSC_IDENTITY_AUTO_DISCOVERY=false
+fi
+
 node --version
 npm --version