From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id A2E6F25782 for ; Thu, 25 Jul 2019 07:34:07 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZI1zGh-AvdwX for ; Thu, 25 Jul 2019 07:34:07 -0400 (EDT) Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 66EE92488F for ; Thu, 25 Jul 2019 07:34:07 -0400 (EDT) From: "Alexander V. Tikhonov" Subject: [tarantool-patches] [PATCH v1] travis-ci: found wrong global environment setup Date: Thu, 25 Jul 2019 14:34:04 +0300 Message-Id: <85c09b2d0418f471df96e866bfd06433f439de28.1563996108.git.avtikhon@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Kirill Yukhin Cc: "Alexander V. Tikhonov" , tarantool-patches@freelists.org Found that the travis-ci global environment values schema had the mistake in definition - fixed with added "global:" tag and added the missed travis-ci environment value to the docker call. Closes #4377 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4377-travis-global-env Issue: https://github.com/tarantool/tarantool/issues/4377 .travis.mk | 1 + .travis.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.mk b/.travis.mk index 7d349bc21..ca7f209b1 100644 --- a/.travis.mk +++ b/.travis.mk @@ -34,6 +34,7 @@ docker_%: -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \ -e CMAKE_EXTRA_PARAMS=${CMAKE_EXTRA_PARAMS} \ -e APT_EXTRA_FLAGS="${APT_EXTRA_FLAGS}" \ + -e TEST_RUN_EXTRA_PARAMS="${TEST_RUN_EXTRA_PARAMS}" \ -e CC=${CC} \ -e CXX=${CXX} \ ${DOCKER_IMAGE} \ diff --git a/.travis.yml b/.travis.yml index 61c887296..21a69d15a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,9 @@ cache: git: depth: 100500 -env: > - TEST_RUN_EXTRA_PARAMS="-j 1" +env: + global: + - TEST_RUN_EXTRA_PARAMS="-j 1" jobs: include: -- 2.17.1