File tree 4 files changed +9
-16
lines changed
4 files changed +9
-16
lines changed Original file line number Diff line number Diff line change 1
- sudo : required
2
1
dist : trusty
3
2
services :
4
3
- docker
@@ -51,11 +50,11 @@ matrix:
51
50
env : MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=x86_64-apple-darwin NO_ADD=1
52
51
53
52
install :
54
- - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
53
+ - if [ -z "$NO_ADD" ]; then rustup target add " $TARGET" ; fi
55
54
- rustup component add rustfmt
56
55
57
56
script :
58
- - mkdir -p target/$TARGET;
57
+ - mkdir -p target/" $TARGET" ;
59
58
- >
60
59
case "$TARGET" in
61
60
*-linux-android) DOCKER=android ;; # Android uses a local docker image
@@ -68,6 +67,9 @@ script:
68
67
else
69
68
PATH="$HOME/rust/bin:$PATH" bash ci/run.sh;
70
69
fi
70
+ - if [ "${TRAVIS_OS_NAME}" = linux ]; then
71
+ shellcheck -e SC1090 -- rustup-init.sh ci/*.sh ci/*.bash;
72
+ fi
71
73
72
74
before_deploy :
73
75
- bash ci/prepare-deploy-travis.sh
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then
28
28
travis_fold end " build.Dockerfile.${DOCKER} "
29
29
fi
30
30
31
+ # shellcheck disable=SC2016
31
32
docker run \
32
33
--entrypoint bash \
33
34
--user " $( id -u) " :" $( id -g) " \
Original file line number Diff line number Diff line change 2
2
3
3
set -ex
4
4
5
- printf ' toolchain versions\n------------------\n'
6
-
7
5
rustc -vV
8
6
cargo -vV
9
7
rustfmt -vV
18
16
# Check the formatting last because test failures are more interesting to have
19
17
# discovered for contributors lacking some platform access for testing beforehand
20
18
cargo fmt --all -- --check
21
-
22
- # Then check the shell scripts, if shellcheck is present (which it is on Travis CI)
23
- if command -v shellcheck > /dev/null 2>&1 ; then
24
- shellcheck --version
25
- shellcheck -- * .sh ci/* .sh
26
- else
27
- echo No shellcheck found, skipping.
28
- fi
Original file line number Diff line number Diff line change 1
- #! /bin/false
1
+ #! /bin/bash
2
2
#
3
- # This file is intended to be sourced, hence the invalid shebang and
4
- # not being marked as an executable file in git.
3
+ # This file is intended to be sourced, so it is not being marked as
4
+ # an executable file in git.
5
5
6
6
# This is from
7
7
# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_setup_env.bash
You can’t perform that action at this time.
0 commit comments