Skip to content

Commit

Permalink
Fixes for dev-tool/jenkins_ci (elastic#3355)
Browse files Browse the repository at this point in the history
- Use absolute path to gimme inside of scripts to avoid requiring $HOME/bin be on the PATH.
- export the RACE_DETECTOR variable from the jenkins_ci script so that it is picked up by make
- Add execute permissions
  • Loading branch information
andrewkroh authored and ruflin committed Jan 12, 2017
1 parent 01ded70 commit fed391d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions dev-tools/common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ install_gimme() {
chmod +x ${HOME}/bin/gimme
fi

debug "Gimme version $(gimme version)"
GIMME="${HOME}/bin/gimme"
debug "Gimme version $(${GIMME} version)"
}

# setup_go_root "version"
Expand All @@ -57,7 +58,7 @@ setup_go_root() {
install_gimme

# Setup GOROOT and add go to the PATH.
gimme "${version}" > /dev/null
${GIMME} "${version}" > /dev/null
source "${HOME}/.gimme/envs/go${version}.env" 2> /dev/null

debug "$(go version)"
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/jenkins_ci
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ parse_args() {
exit 0
;;
-r|--race)
RACE_DETECTOR=1
export RACE_DETECTOR=1
shift
;;
-v|--verbose)
Expand Down
Empty file modified dev-tools/run_with_go_ver
100644 → 100755
Empty file.

0 comments on commit fed391d

Please sign in to comment.