Browse Source

install scripts: update go version, remove upgrade cmd (#2650)

* [install scripts] update go version, remove upgrade

- upgrading OS is out of scope of installation scripts

* add missing log statement

Refs https://github.com/tendermint/tendermint/pull/2642#discussion_r225786794
pull/2650/merge
Anton Kaliaev 6 years ago
committed by Ethan Buchman
parent
commit
d20693fb16
3 changed files with 11 additions and 12 deletions
  1. +2
    -0
      consensus/state_test.go
  2. +5
    -6
      scripts/install/install_tendermint_bsd.sh
  3. +4
    -6
      scripts/install/install_tendermint_ubuntu.sh

+ 2
- 0
consensus/state_test.go View File

@ -949,6 +949,8 @@ func TestProposeValidBlock(t *testing.T) {
round = round + 2 // moving to the next round
ensureNewRound(newRoundCh, height, round)
t.Log("### ONTO ROUND 3")
ensureNewTimeout(timeoutWaitCh, height, round, cs1.config.TimeoutPrecommit.Nanoseconds())
round = round + 1 // moving to the next round


+ 5
- 6
scripts/install/install_tendermint_bsd.sh View File

@ -17,16 +17,15 @@ set BRANCH=master
sudo pkg update
sudo pkg upgrade -y
sudo pkg install -y gmake
sudo pkg install -y git
# get and unpack golang
curl -O https://storage.googleapis.com/golang/go1.10.freebsd-amd64.tar.gz
tar -xvf go1.10.freebsd-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.11.freebsd-amd64.tar.gz
tar -xvf go1.11.freebsd-amd64.tar.gz
# move go binary and add to path
mv go /usr/local
# move go folder and add go binary to path
sudo mv go /usr/local
set path=($path /usr/local/go/bin)
@ -41,7 +40,7 @@ source ~/.tcshrc
# get the code and move into repo
set REPO=github.com/tendermint/tendermint
go get $REPO
cd $GOPATH/src/$REPO
cd "$GOPATH/src/$REPO"
# build & install master
git checkout $BRANCH


+ 4
- 6
scripts/install/install_tendermint_ubuntu.sh View File

@ -14,14 +14,13 @@ REPO=github.com/tendermint/tendermint
BRANCH=master
sudo apt-get update -y
sudo apt-get upgrade -y
sudo apt-get install -y make
# get and unpack golang
curl -O https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz
tar -xvf go1.10.linux-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz
tar -xvf go1.11.linux-amd64.tar.gz
# move go binary and add to path
# move go folder and add go binary to path
sudo mv go /usr/local
echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.profile
@ -29,12 +28,11 @@ echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.profile
mkdir goApps
echo "export GOPATH=$HOME/goApps" >> ~/.profile
echo "export PATH=\$PATH:\$GOPATH/bin" >> ~/.profile
source ~/.profile
# get the code and move into repo
go get $REPO
cd $GOPATH/src/$REPO
cd "$GOPATH/src/$REPO"
# build & install
git checkout $BRANCH


Loading…
Cancel
Save