diff mbox series

[v3,4/5] travis: merge variable sections

Message ID 1516759212-29210-5-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v3,1/5] build: odp_dpdk: another fix for linking with shared libdpdk | expand

Commit Message

Github ODP bot Jan. 24, 2018, 2 a.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Travis ignores first env setting once it encountered second one. Merge
them together.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 416 (lumag:trav-dpdk-shared)
 ** https://github.com/Linaro/odp/pull/416
 ** Patch: https://github.com/Linaro/odp/pull/416.patch
 ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13
 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8
 **/
 .travis.yml | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index fca06a0d2..98d0b0115 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,27 +15,6 @@  stages:
   - "build only"
   - test
 env:
-  global:
-    # COVERITY_SCAN_TOKEN
-    # ** specific to your project **
-    # Note:
-    # You should have a github account and travis linked travis account.
-    # The secure key to be filled below is the 685 character long encrypted
-    # token you can find as follow from your coverity dashboard
-    # (at https://scan.coverity.com/dashboard):
-    # Click on the github project (<you>/odp)
-    # Click on "submit build"
-    # Click on "Configure Travis CI"
-    # Look at the COVERITY_SCAN_TOKEN in the env: global: section
-    # of the configuration example.
-    # copy the secure:<key> below
-    #
-    - secure: "xxxx"
-    #
-    # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see
-    # for individual commit validation. But you you want to track tests history
-    # you need generated new one at https://codecov.io specific for your repo.
-    - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
 
 addons:
         apt:
@@ -53,10 +32,6 @@  addons:
 #                        build_command:   "make"
 #                        branch_pattern: coverity_scan
 
-compiler:
-        - gcc
-        - clang-3.8
-
 cache:
         ccache: true
         pip: true
@@ -67,6 +42,13 @@  cache:
                 - $HOME/doxygen-install
 
 env:
+    global:
+        #
+        # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see
+        # for individual commit validation. But you you want to track tests history
+        # you need generated new one at https://codecov.io specific for your repo.
+        - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
+    matrix:
         - CONF=""
         - CONF="--disable-abi-compat"
         - CONF="--enable-deprecated"
@@ -84,6 +66,10 @@  env:
         - CROSS_ARCH="powerpc" CONF="--disable-abi-compat"
         - CROSS_ARCH="i386" CONF="--disable-abi-compat"
 
+compiler:
+        - gcc
+        - clang-3.8
+
 before_install:
 
         # Install cross toolchains, etc