From 32913478c7e74b69dafe28fbeb8d515fd5cc6433 Mon Sep 17 00:00:00 2001
From: jaime <cloud.poster@gmail.com>
Date: Tue, 18 Jan 2022 21:29:23 +0800
Subject: [PATCH] Revert "Fix go version (#15266)"

This reverts commit c68aa671b908857063387014a941f7db04f698b7.
---
 .github/workflows/code-checker.yaml |  8 ++------
 scripts/cwrapper_rocksdb_build.sh   |  3 +--
 scripts/install_deps.sh             | 16 ++++++++--------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml
index 2066837fd..dc144a413 100644
--- a/.github/workflows/code-checker.yaml
+++ b/.github/workflows/code-checker.yaml
@@ -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
\ No newline at end of file
+           brew install boost libomp ninja tbb
+           make check-proto-product && make verifiers
\ No newline at end of file
diff --git a/scripts/cwrapper_rocksdb_build.sh b/scripts/cwrapper_rocksdb_build.sh
index 60e1a510b..513c7681a 100755
--- a/scripts/cwrapper_rocksdb_build.sh
+++ b/scripts/cwrapper_rocksdb_build.sh
@@ -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
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
index 2086a96cb..0701d6345 100755
--- a/scripts/install_deps.sh
+++ b/scripts/install_deps.sh
@@ -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)"
-- 
GitLab