From efabd3e1d0c90745512bc64b880b884a5d4981a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 5 May 2020 08:48:43 +0200
Subject: [PATCH] MOBILE-3401 travis: Avoid executing check when deploying

---
 .travis.yml  | 9 ++++++++-
 package.json | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15c94b622..d815bf211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_script:
 jobs:
   include:
   - stage: check
-    if: NOT branch =~ /(master|integration|desktop)$/
+    if: NOT branch =~ /(master|integration|desktop)$/ AND env(DEPLOY) IS blank
     os: linux
     script: npm run build --bailOnLintError true --typeCheckOnLint true
   - stage: mirror
@@ -57,6 +57,8 @@ jobs:
     dist: trusty
     group: edge
     language: android
+    env:
+    - BUILD_PLATFORM='android'
     before_install:
     - nvm install 11
     - node --version
@@ -70,6 +72,8 @@ jobs:
     if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank))
     os: osx
     osx_image: xcode11.3
+    env:
+    - BUILD_PLATFORM='ios'
     script: scripts/aot.sh
   - stage: build
     name: "Build Linux"
@@ -78,6 +82,7 @@ jobs:
     env:
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+    - BUILD_PLATFORM='linux'
     script: scripts/aot.sh
   - stage: build
     name: "Build MacOS"
@@ -87,6 +92,7 @@ jobs:
     env:
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+    - BUILD_PLATFORM='osx'
     script: scripts/aot.sh
   - stage: build
     name: "Build Windows"
@@ -97,4 +103,5 @@ jobs:
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
     - ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true
     - DEBUG=electron-windows-store
+    - BUILD_PLATFORM='windows'
     script: scripts/aot.sh
diff --git a/package.json b/package.json
index d1b669d91..01ebae113 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
       "nl.kingsquare.cordova.background-audio": {},
       "phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
-        "FCM_VERSION": "17.0.+"
+        "FCM_VERSION": "17.5.+"
       },
       "cordova-plugin-geolocation": {
         "GEOLOCATION_USAGE_DESCRIPTION": "To locate you"