Merge pull request Smile-SA#1168 from romainruaud/fix_travis-config

Refactoring travis jobs.
rbayet · Oct 31, 2018 · 40feb63 · 40feb63
2 parents ee30e36 + 85e59ff
commit 40feb63
Showing 1 changed file with 38 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,35 +15,44 @@ addons:
 
 language: php
 
-php:
-- 7.0
-- 7.1
-- 7.2
-
-env:
-  matrix:
-    - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=community
-    - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=enterprise
-    - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=community
-    - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=enterprise
-    - MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=community MAGENTO_STABILITY=beta
-#    - MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=enterprise MAGENTO_STABILITY=beta
-
-matrix:
-  fast_finish: true
-  exclude:
-    - php: 7.2
-      env: MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=community
-    - php: 7.2
-      env: MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=enterprise
-    - php: 7.2
-      env: MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=community
-    - php: 7.2
-      env: MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=enterprise
+jobs:
+  include:
+    - php: 7.0
+      env:
+        - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=community
+    - php: 7.1
+      env:
+        - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=community
     - php: 7.0
-      env: MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=community MAGENTO_STABILITY=beta
-#    - php: 7.0
-#      env: MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=enterprise MAGENTO_STABILITY=beta
+      env:
+        - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=community
+    - php: 7.1
+      env:
+        - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=community
+    - if: type != pull_request
+      php: 7.0
+      env:
+        - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=enterprise
+    - if: type != pull_request
+      php: 7.1
+      env:
+        - MAGENTO_VERSION=2.2.5 MAGENTO_EDITION=enterprise
+    - if: type != pull_request
+      php: 7.0
+      env:
+        - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=enterprise
+    - if: type != pull_request
+      php: 7.1
+      env:
+        - MAGENTO_VERSION=2.2.6 MAGENTO_EDITION=enterprise
+    - if: type != pull_request
+      php: 7.2
+      env:
+        - MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=community MAGENTO_STABILITY=beta
+#    - if: type != pull_request
+#      php: 7.2
+#      env:
+#        -MAGENTO_VERSION=2.3.0 MAGENTO_EDITION=enterprise MAGENTO_STABILITY=beta
 
 before_install:
   - sudo service elasticsearch stop
@@ -54,7 +63,7 @@ before_install:
   - yes | sudo $ES_HOME/bin/elasticsearch-plugin install analysis-phonetic
   - sudo service elasticsearch start
   - sleep 5
-  - composer config -g http-basic.repo.magento.com $MAGENTO_USERNAME $MAGENTO_PASSWORD
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then composer config -g http-basic.repo.magento.com $MAGENTO_USERNAME $MAGENTO_PASSWORD ; fi
   - echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json
   - composer global require hirak/prestissimo:0.3.4
   - chmod +x ./Resources/travis/*