From patchwork Wed Jan 24 03:00:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125620 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp141115ljf; Tue, 23 Jan 2018 19:05:47 -0800 (PST) X-Google-Smtp-Source: AH8x227hidKeWphzWryJRC9pkOOu8SLfWHGXrSmsEcmoGPwQ82s0HCHfrUjWgG9JyNY3h2tmnCuC X-Received: by 10.200.13.1 with SMTP id q1mr115330qti.64.1516763147500; Tue, 23 Jan 2018 19:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763147; cv=none; d=google.com; s=arc-20160816; b=sySmiWzNZDzxKBWbp5sBW8knrrolhrJSvAc8TkRy6wqCsGjz5e9pWECfNbmvc0ZDyx vLVhtzRop944GDVe8X9Tf1TlpSqHv4KMnBBg8gckzg1NdZ8ewS84hMTlKdYqI6aOkWpK ltC+MNsICEuj8yTMF8KWd6SCdjgrA25q8Jklmn+q2xHLexG2WME9eR1CCItfWN2k0jy1 dYVa7CV93cQteezc36jQjkjAsHbVGBovqPV8J0HI+4XsvtpwaJHU2NmNpOAC0rfM5Xvk 6HTQuaBGon7TRKYY77YQPSqPFVKUN7ZQhncaVC+O2oXq/E2qoda/s74q5+i67JI04yQl 2DgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=3aOk8tcqaFBQ1jz/m3Qs6+V6C/dqynfmO7lXzxF3h5Q=; b=JiQvpweeN418H+GK1oaL3ttpQeEemb89bjhw18DjzSoTsRJHS4bhVtnXubgC6S8rP1 fCydhQUvi8GLp/venaUdq7CCY8nK2Cdu1ZIRB/owI+XMkCAGuMXhG2h4/RbaN5uBO20h 8xw+OkaPAABl1lSVFkHbSddM7KrQ1+/2bCkuxt+5au8lNUkgcUgXFaeU8z7UzMoIS/DI nZVwGHnaMiypSMUHfb2MYgtAtqudZigzMkdLCoCs+zs6MawJq1B8CugFj2sZX5Lw8NOx ak3lo9Eg5Xnb/uGOxu1n/B71CtqJdZDd/j5XY30gh2lr6RaQ/nfGs/jaFAvQSyoeXl7f XncQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h126si3376456qkf.206.2018.01.23.19.05.47; Tue, 23 Jan 2018 19:05:47 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2E59061785; Wed, 24 Jan 2018 03:05:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 883ED617EC; Wed, 24 Jan 2018 03:02:06 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 76B5961702; Wed, 24 Jan 2018 03:02:01 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 2BAB761701 for ; Wed, 24 Jan 2018 03:00:19 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 3BC3D4081986 for ; Wed, 24 Jan 2018 06:00:17 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XNZKwI9luR-0HFebR70; Wed, 24 Jan 2018 06:00:17 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0G3uYKoj; Wed, 24 Jan 2018 06:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 24 Jan 2018 06:00:13 +0300 Message-Id: <1516762814-30313-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516762814-30313-1-git-send-email-odpbot@yandex.ru> References: <1516762814-30313-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v4 4/5] travis: merge variable sections X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Travis ignores first env setting once it encountered second one. Merge them together. Signed-off-by: Dmitry Eremin-Solenikov --- /** 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ .travis.yml | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index fca06a0d2..ce1fd27e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,28 +14,6 @@ group: deprecated-2017Q2 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 (/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: 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 +31,6 @@ addons: # build_command: "make" # branch_pattern: coverity_scan -compiler: - - gcc - - clang-3.8 - cache: ccache: true pip: true @@ -67,6 +41,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 +65,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