From 662dcb67d23d96764a35bac2c75ca8984ddc181d Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Sun, 17 Mar 2019 16:27:41 +0300 Subject: [PATCH] Update Travis build matrix --- .travis.yml | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78d1336..c3d5d2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,17 @@ language: rust +env: + - TARGET=x86_64-unknown-linux-gnu + - TARGET=riscv32imac-unknown-none-elf + +rust: + - nightly + - stable + +if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) + matrix: include: - #- env: TARGET=x86_64-unknown-linux-gnu - # if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - #- env: TARGET=riscv32imac-unknown-none-elf - # if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - #- env: TARGET=x86_64-unknown-linux-gnu - # rust: beta - # if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - #- env: TARGET=riscv32imac-unknown-none-elf - # rust: beta - # if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - - env: TARGET=x86_64-unknown-linux-gnu - rust: nightly - if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - - env: TARGET=riscv32imac-unknown-none-elf - rust: nightly - if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - env: TARGET=riscv64imac-unknown-none-elf rust: nightly if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) @@ -32,13 +20,6 @@ matrix: rust: nightly if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - env: TARGET=x86_64-unknown-linux-gnu - rust: stable - if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) - - - env: TARGET=riscv32imac-unknown-none-elf - rust: stable - if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) before_install: set -e