From c33a624959f91edbef8f88fc7b0164c86f147801 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Tue, 21 Aug 2018 14:02:22 -0700 Subject: [PATCH] Change .ci/* scripts to be non-executable (#158) fixes #157 Reviewed-by: @brcolow --- .ci/before_install.sh | 0 .ci/script.sh | 0 .github/pr-check-whitespace.sh | 5 ++--- .travis.yml | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) mode change 100755 => 100644 .ci/before_install.sh mode change 100755 => 100644 .ci/script.sh diff --git a/.ci/before_install.sh b/.ci/before_install.sh old mode 100755 new mode 100644 diff --git a/.ci/script.sh b/.ci/script.sh old mode 100755 new mode 100644 diff --git a/.github/pr-check-whitespace.sh b/.github/pr-check-whitespace.sh index 318abb0fe5..cbdf341dbc 100644 --- a/.github/pr-check-whitespace.sh +++ b/.github/pr-check-whitespace.sh @@ -12,7 +12,6 @@ fi ROOTDIR=$(git rev-parse --show-toplevel) cd $ROOTDIR -# Check all files changes as part of this pull request, excluding the .ci/ -# directory which has executable shell scripts +# Check all files changed as part of this pull request # FIXME: maybe remove the -v option at some point -bash .github/pr-list-files.sh | grep -v ^.ci/ | bash tools/scripts/checkWhiteSpace -S -x -v +bash .github/pr-list-files.sh | bash tools/scripts/checkWhiteSpace -S -x -v diff --git a/.travis.yml b/.travis.yml index 4bcdd243f6..6ce23c6959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,12 +63,12 @@ before_script: # run on xvfb screen (for linux). - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start; fi -before_install: .ci/before_install.sh +before_install: bash .ci/before_install.sh # skip install stage. install: true -script: .ci/script.sh +script: bash .ci/script.sh notifications: email: false