From 4f76c4e45c5c512ab3ad05b0c302984e89ab3c47 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eromano@users.noreply.github.com>
Date: Thu, 11 Apr 2019 12:07:18 +0100
Subject: [PATCH] [build-issue] Run always all when is not a PR (#4593)

* run always all when is not a PR

* run always all when is not a PR

* run always all when is not a PR

* run always all when is not a PR

* run always all when is not a PR
---
 .travis.yml              | 27 +++++++++++++--------------
 demo-shell/proxy.conf.js |  2 +-
 tslint.json              |  2 --
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cfefd25d9..66e0d36397 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,7 @@ branches:
 
 # TRAVIS_PULL_REQUEST == false means is running on dev branch and is not a PR
 stages:
-  - name: Warm Up Cache
-    if: branch = master
   - name: Warm Up Cache & Lint & Build Dist
-    if: branch != master
   - name: Unit test
   - name: e2e Test
   - name: Create Docker PR
@@ -44,19 +41,21 @@ before_install:
 
 jobs:
     include:
-        - stage: Warm Up Cache
-          script:
-          - ./scripts/npm-build-all.sh || exit 1
         - stage: Warm Up Cache & Lint & Build Dist
           script:
-          - ./scripts/update-version.sh -gnu -alpha || exit 1
-          - npm install
-          - ./scripts/lint.sh || exit 1
-          - rm -rf tmp && mkdir tmp
-          - git merge-base origin/$TRAVIS_BRANCH HEAD > ./tmp/devhead.txt
-          - (./scripts/smart-build.sh -b $TRAVIS_BRANCH  -gnu || exit 1;);
-          - npm run build:dist || exit 1
-          - ./scripts/license-list-generator.sh
+            if [[ $TRAVIS_PULL_REQUEST == "false" ]];
+              then
+               (./scripts/npm-build-all.sh || exit 1);
+              else
+               (./scripts/update-version.sh -gnu -alpha || exit 1);
+               npm install;
+               (./scripts/lint.sh || exit 1);
+               (rm -rf tmp && mkdir tmp);
+               (git merge-base origin/$TRAVIS_BRANCH HEAD > ./tmp/devhead.txt);
+               (./scripts/smart-build.sh -b $TRAVIS_BRANCH  -gnu || exit 1);
+              fi;
+             (npm run build:dist || exit 1);
+             (./scripts/license-list-generator.sh || exit 1);
         - stage: Unit test
           name: core and extensions
           script:
diff --git a/demo-shell/proxy.conf.js b/demo-shell/proxy.conf.js
index eaa6a59bb1..7da0babb2f 100644
--- a/demo-shell/proxy.conf.js
+++ b/demo-shell/proxy.conf.js
@@ -1,6 +1,6 @@
 module.exports = {
     "/alfresco": {
-        "target": "http://aps2staging.envalfresco.com",
+        "target": "http://localhost:8080",
         "secure": false,
         "pathRewrite": {
             "^/alfresco/alfresco": ""
diff --git a/tslint.json b/tslint.json
index cefc89ebcf..85f3072268 100644
--- a/tslint.json
+++ b/tslint.json
@@ -180,9 +180,7 @@
       true,
       2
     ],
-    "contextual-life-cycle": true,
     "use-host-property-decorator": false,
-    "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
     "directive-class-suffix": true,