From patchwork Wed Jan 24 02:00:11 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: 125614 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp116796ljf; Tue, 23 Jan 2018 18:02:15 -0800 (PST) X-Google-Smtp-Source: AH8x226ugGTMZZLfPejbd5JEBxwfH/P1zglDHpsYntrbrcEI6zSCnI+aY5jAzfHFKHKSugwCVFox X-Received: by 10.55.185.134 with SMTP id j128mr3967695qkf.341.1516759335085; Tue, 23 Jan 2018 18:02:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759335; cv=none; d=google.com; s=arc-20160816; b=b7QkQY633QooleObkjUzuLMr4PfAN5TEpD3y0b7ThhlFAn1sFtdpibNBRz1gWYBlWx Ul0+TEya2qm6xz4L8EsFx4x/yaOoDYFtheVzf9ANsQYng6nf/yTDOStt4pcD8KSDPAfd WVFaGYH2RwC+YMvgUMyfLA7p+wc0D8p2jbKAyZhk/4ObVgIb8uDUTfcCaxnA92DWKZXn 2H9EE8GIsSsHqK4fQcmTynsyk5gtMau4EWUrGy8UfYi1bQm101T/unitpJuOxwVGAEWN JbhR7Z4iYRuLLgsZXgxyIgtzY3Lmm2WUp1P4mHNkCOm4S2WyufuUWFlElpLm0CD7Cbzw 4a/Q== 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=kz4A9CZ3hyQQZdKAnPb3hLlyb1gpSDsKYVyqRr/vfMM=; b=TNGseC8vp1m+wGsnJ1abprpQCeL0WzLxy+n+fHQRQ21Zqj5wMJvchvViSPxg5B6JNY 21PscQNGZmaS649F9ZoUNtEaPATCXuNUG/y2WvRdVF8SoCptRBfYTPPQ1G/qk1H+DV1x PFFOsCfE9neKje/SOghjit2+A2MSk31vk1rXkAjixjAGzMYedfmjQcP3G6WBsD/D5t+o mVVlSRa2bGMdJS2ClyOPvee/VDI2lqZW3i1hgA+lZMPzY4AhPBofZ8Bm/vrl1fWS+lbv ktj/fvWZ/2caJQwAJ5CVLsISOhKgnaIZWAd3EG9Z4VH0e/uPSSavVci9Fg+ggu5eRRjw 8IJQ== 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 p5si1759769qtf.17.2018.01.23.18.02.14; Tue, 23 Jan 2018 18:02:15 -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 BEC1F617E0; Wed, 24 Jan 2018 02:02:14 +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 E4D80617E4; Wed, 24 Jan 2018 02:00:31 +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 CDF6161520; Wed, 24 Jan 2018 02:00:21 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 91B1D60974 for ; Wed, 24 Jan 2018 02:00:19 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward100o.mail.yandex.net (Yandex) with ESMTP id D650A2A23846 for ; Wed, 24 Jan 2018 05:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ntyp71qWp9-0H9udAvW; Wed, 24 Jan 2018 05:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0HNWtcT5; Wed, 24 Jan 2018 05:00:17 +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 05:00:11 +0300 Message-Id: <1516759212-29210-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 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: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ .travis.yml | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) 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 (/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 +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