From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <fam@euphon.net>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 07/13] travis: standardize the syntax used for env variables
Date: Wed, 9 Jan 2019 16:31:08 +0000 [thread overview]
Message-ID: <20190109163114.17010-8-berrange@redhat.com> (raw)
In-Reply-To: <20190109163114.17010-1-berrange@redhat.com>
Matrix entries are defining env variables using two different syntax
styles:
- env: FOO=bar
WIZZ=bang
and
- env:
- FOO=bar
- WIZZ=bang
Switch everything to use the latter style as the more normal indentation
approach.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.travis.yml | 77 ++++++++++++++++++++++++++++++++++-------------------
1 file changed, 49 insertions(+), 28 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 96917df9c5..f539f8b556 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,102 +81,123 @@ script:
matrix:
include:
- - env: CONFIG="--disable-system"
+ - env:
+ - CONFIG="--disable-system"
- - env: CONFIG="--disable-user"
+ - env:
+ - CONFIG="--disable-user"
- - env: CONFIG="--enable-debug --enable-debug-tcg"
+ - env:
+ - CONFIG="--enable-debug --enable-debug-tcg"
- - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user"
+ - env:
+ - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user"
- - env: CONFIG="--enable-modules --disable-linux-user"
+ - env:
+ - CONFIG="--enable-modules --disable-linux-user"
- - env: CONFIG="--with-coroutine=ucontext --disable-linux-user"
+ - env:
+ - CONFIG="--with-coroutine=ucontext --disable-linux-user"
- - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
+ - env:
+ - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
# Test out-of-tree builds
- - env: CONFIG="--enable-debug --enable-debug-tcg"
- BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
+ - env:
+ - CONFIG="--enable-debug --enable-debug-tcg"
+ - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
# Test with Clang for compile portability (Travis uses clang-5.0)
- - env: CONFIG="--disable-system"
+ - env:
+ - CONFIG="--disable-system"
compiler: clang
- - env: CONFIG="--disable-user"
+ - env:
+ - CONFIG="--disable-user"
compiler: clang
# gprof/gcov are GCC features
- - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
+ - env:
+ - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
after_success:
- ${SRC_DIR}/scripts/travis/coverage-summary.sh
compiler: gcc
# We manually include builds which we disable "make check" for
- - env: CONFIG="--enable-debug --enable-tcg-interpreter"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-debug --enable-tcg-interpreter"
+ - TEST_CMD=""
compiler: gcc
# We don't need to exercise every backend with every front-end
- - env: CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
- TEST_CMD=""
+ - env:
+ - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
+ - TEST_CMD=""
compiler: gcc
- - env: CONFIG="--disable-tcg"
- TEST_CMD=""
+ - env:
+ - CONFIG="--disable-tcg"
+ - TEST_CMD=""
compiler: gcc
# MacOSX builds
- - env: CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
os: osx
osx_image: xcode9.4
compiler: clang
- - env: CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
os: osx
osx_image: xcode10
compiler: clang
# Python builds
- - env: CONFIG="--target-list=x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=x86_64-softmmu"
python:
- "3.0"
- - env: CONFIG="--target-list=x86_64-softmmu"
+ - env:
+ - CONFIG="--target-list=x86_64-softmmu"
python:
- "3.6"
# Acceptance (Functional) tests
- - env: CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"
- TEST_CMD="make AVOCADO_SHOW=app check-acceptance"
+ - env:
+ - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu"
+ - TEST_CMD="make AVOCADO_SHOW=app check-acceptance"
addons:
apt:
packages:
--
2.19.2
next prev parent reply other threads:[~2019-01-09 16:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 16:31 [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 01/13] tests: run ldconfig after installing extra software Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 02/13] tests: remove obsolete 'debian' dockerfile Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 03/13] tests: update Fedora dockerfile to use Fedora 29 Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 04/13] tests: update Fedora i386 cross image to " Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 05/13] travis: add whitespace between each major section & matrix entry Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 06/13] travis: define all the build matrix entries in one place Daniel P. Berrangé
2019-01-09 16:31 ` Daniel P. Berrangé [this message]
2019-01-09 16:31 ` [Qemu-devel] [PATCH 08/13] travis: don't clone git submodules upfront Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries Daniel P. Berrangé
2019-01-09 17:01 ` Alex Bennée
2019-01-09 17:13 ` Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 11/13] travis: stop using container based envs Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 12/13] travis: run tests in verbose mode Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 13/13] travis: remove matrix settings that duplicate global settings Daniel P. Berrangé
2019-01-13 19:53 ` [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190109163114.17010-8-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.