diff --git a/.ci/install_go.sh b/.ci/install_go.sh index d602f5e8c..038b3d42d 100755 --- a/.ci/install_go.sh +++ b/.ci/install_go.sh @@ -29,12 +29,12 @@ finish() { } die() { - echo >&2 -e "\e[1mERROR\e[0m: $*" + echo >&2 -e "ERROR: $*" exit 1 } info() { - echo -e "\e[1mINFO\e[0m: $*" + echo -e "INFO: $*" } usage(){ @@ -59,7 +59,6 @@ EOT exit "$exit_code" } - trap finish EXIT pushd "${tmp_dir}" @@ -72,7 +71,6 @@ do esac done - go_version="${1:-""}" if [ -z "$go_version" ];then usage 0 @@ -81,8 +79,6 @@ elif [ -n "${USE_VERSIONS_FILE}" ] ;then get_cc_versions fi - - info "Download go version ${go_version}" curl -OL https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz info "Remove old go installation" @@ -90,5 +86,3 @@ sudo rm -r /usr/local/go/ info "Install go" sudo tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz popd - - diff --git a/.ci/setup.sh b/.ci/setup.sh index 2615c65c5..a61100a9e 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -38,6 +38,8 @@ if [ -n "$PULL_REQUEST_NUMBER" ] || [ -n "$LOCALCI_PR_NUMBER" ]; then bash -f "${cidir}/run_fetch_branches_tool.sh" fi +echo "Install go" +bash -c "${cidir}/install_go.sh -p" echo "Install shim" bash -f ${cidir}/install_shim.sh