On 08/01/2020 23.49, Alex Bennée wrote:
> The idea of this is split the build across stages so any failure in
> one stage will save time running later stages. So far I have have
> arbitrarily chosen:
>
> canary: up-front quick to build and run
> platforms: common build configurations
> rest: everything else
>
> The ideal should be canary and platforms catch the most common and
> frequent build breakages and the "rest" aims for completeness.
I like that idea. Just two nits:
> diff --git a/.travis.yml b/.travis.yml
> index 6c1038a0f1a..648c523ce59 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -17,8 +17,12 @@ cache:
> pip: true
> directories:
> - $HOME/avocado/data/cache
> +stages:
> + - canary
> + - platforms
> + - rest
>
> -
> +
White space damage #1
> addons:
> apt:
> packages:
[...]
> @@ -116,28 +123,33 @@ matrix:
> - CONFIG="--disable-user --disable-system"
> - TEST_CMD="make check-unit check-softfloat -j3"
> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> + stage: canary
>
>
> # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower
> - env:
> - CONFIG="--enable-debug --target-list=${MAIN_SOFTMMU_TARGETS}"
> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
> + stage: rest
>
>
> # TCG debug can be run just on its own and is mostly agnostic to
> user/softmmu distinctions
> - env:
> - CONFIG="--enable-debug-tcg --disable-system"
> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
> + stage: rest
>
> -
> +
White space damage #2
> - env:
> - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr
> --disable-brlapi --disable-libusb --disable-replication
> --target-list=${MAIN_SOFTMMU_TARGETS}"
> + stage: rest
[...]
> @@ -272,6 +299,7 @@ matrix:
> - TEST_CMD="make check-acceptance"
> after_script:
> - python3 -c 'import json; r =
> json.load(open("tests/results/latest/results.json")); [print(t["logfile"])
> for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat
> + stage: rest
> addons:
> apt:
> packages:
> @@ -321,6 +349,7 @@ matrix:
> - uuid-dev
> language: generic
> compiler: none
> + stage: platforms
> env:
> - COMPILER_NAME=gcc CXX=g++-9 CC=gcc-9
> - CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-pie --disable-linux-user"
Could you maybe also make sure that we've got the same order of the tags
everywhere? Currently, you sometimes use "stage" before "env" and
sometimes after "env", that's a little bit confusing.
Thomas
