From e8c708d81b91a90d4ca581b5ea372f2a4f177bc3 Mon Sep 17 00:00:00 2001 From: Brandon W Maister Date: Fri, 13 Sep 2019 15:24:28 -0400 Subject: [PATCH] Make CI able to run non-cargo commands in `channel` --- ci/travis.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ci/travis.sh b/ci/travis.sh index 9665573..18b7c27 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -8,19 +8,33 @@ set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" channel() { + channel_run cargo "$@" +} + +channel_run() { if [ -n "${TRAVIS}" ]; then if [ "${TRAVIS_RUST_VERSION}" = "${CHANNEL}" ]; then pwd - (set -x; cargo "$@") + echo "$ $*" + "$@" fi elif [ -n "${APPVEYOR}" ]; then if [ "${APPVEYOR_RUST_CHANNEL}" = "${CHANNEL}" ]; then pwd - (set -x; cargo "$@") + echo "$ $*" + "$@" fi else pwd - (set -x; cargo "+${CHANNEL}" "$@") + local cmd="$1" + shift + if [[ $cmd = cargo ]] ; then + echo "$ $cmd +${CHANNEL} $*" + "$cmd" "+${CHANNEL}" "$@" + else + echo "$ $cmd $*" + "$cmd" "$@" + fi fi } @@ -86,7 +100,7 @@ build_only() { } build_core_test() { - rustup target add thumbv6m-none-eabi --toolchain $CHANNEL + channel_run rustup target add thumbv6m-none-eabi --toolchain "$CHANNEL" ( cd ci/core-test channel build -v --target thumbv6m-none-eabi