Revert "Fix go version (#15266)"

This reverts commit c68aa671b9.
pull/15290/head
jaime 2022-01-18 21:29:23 +08:00 committed by GitHub
parent c68aa671b9
commit 32913478c7
3 changed files with 11 additions and 16 deletions

View File

@ -61,9 +61,5 @@ jobs:
- name: Code Check
if: ${{ matrix.os == 'macos-11' }}
run: |
bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
source ~/.gvm/scripts/gvm
gvm install go1.17.2
gvm use go1.17.2
brew install boost libomp ninja tbb
make check-proto-product && make verifiers
brew install boost libomp ninja tbb
make check-proto-product && make verifiers

View File

@ -101,6 +101,5 @@ else
esac
fi
echo "$(go version)==========go version==="
go env -w CGO_LDFLAGS="$ldflags" && GO111MODULE=on
go env -w CGO_LDFLAGS="$ldflags"
go get github.com/tecbot/gorocksdb

View File

@ -55,19 +55,19 @@ function install_linux_deps() {
}
function install_mac_deps() {
if [ ! -f ~/.gvm/scripts/gvm ]; then
sudo bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
fi
source ~/.gvm/scripts/gvm
gvm install go1.17.2
gvm use go1.17.2
sudo xcode-select --install > /dev/null 2>&1
brew install boost libomp ninja tbb cmake llvm
brew uninstall grep
brew install grep
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
brew update && brew upgrade && brew cleanup
if [ ! -f ~/.gvm/scripts/gvm ]; then
bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
fi
source ~/.gvm/scripts/gvm
gvm install go1.17.2
gvm use go1.17.2
brew update && brew upgrade
}
unameOut="$(uname -s)"