Merge pull request #7633 from spalger/ci/sourceRatherThanExec

[ci] source the setup script instead of executing it
This commit is contained in:
Spencer 2016-07-05 13:53:56 -07:00 committed by GitHub
commit 832e5151f4
4 changed files with 5 additions and 10 deletions

View file

@ -37,5 +37,3 @@ if [ -z "$(npm bin)" ]; then
echo "npm does not know where it stores executables..... huh??"
exit 1
fi
export GRUNT="$(npm bin)/grunt"

View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash
set -e
source "$(dirname $0)/_jenkins_setup.sh"
"$(dirname $0)/jenkins_setup.sh"
"$GRUNT" build;
"$(npm bin)/grunt" build;

View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash
set -e
"$(dirname $0)/jenkins_setup.sh"
source "$(dirname $0)/_jenkins_setup.sh"
xvfb-run "$(npm bin)/grunt" jenkins:selenium;

View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash
set -e
source "$(dirname $0)/_jenkins_setup.sh"
"$(dirname $0)/jenkins_setup.sh"
xvfb-run "$GRUNT" jenkins:unit;
xvfb-run "$(npm bin)/grunt" jenkins:unit;