diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-20 10:21:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-20 10:21:27 -0400 |
| commit | 30719e2b92c014926c59b25d6d8736959da84219 (patch) | |
| tree | 886295f99108bc23b24401f99b076b8a68f1f423 /.travis.yml | |
| parent | d5abcf94c7123167725fc22ace342f0d455093c1 (diff) | |
travis-ci: Re-work i.MX6 jobs, clarify Freescale and AArch64
- The catch-all i.MX6 job has been exceeding the time limit again so
split this up further. We now have an i.MX6 job and an
everything-else job.
- The logic we use to say "Freescale and AArch64" can be more clearly
expressed with '&' rather than excluding various other things, so
clear that up.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 8333fae9b3..aaa7433840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,10 +135,13 @@ matrix: BUILDMAN="freescale -x powerpc,m68k,aarch64" - env: - JOB="Freescale AArch64" - BUILDMAN="freescale -x powerpc,m68k,armv7,arm9,arm11" + BUILDMAN="freescale&aarch64" - env: - - JOB="i.MX (non-Freescale)" - BUILDMAN="mx -x freescale" + - JOB="i.MX6 (non-Freescale)" + BUILDMAN="mx6 -x freescale" + - env: + - JOB="i.MX (non-Freescale, non-i.MX6)" + BUILDMAN="mx -x freescale,mx6" - env: - BUILDMAN="samsung" - env: |