diff --git a/.github/workflows/integrationtest1.yml b/.github/workflows/integrationtest1.yml index 57e28efdac..e120aad242 100644 --- a/.github/workflows/integrationtest1.yml +++ b/.github/workflows/integrationtest1.yml @@ -23,6 +23,10 @@ jobs: uses: actions/setup-node@v3 with: node-version: 'v16.20.2' + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: '1.18.10' - name: Set up linux environment run: # installs development tools and updates .bash_profile bash test/integration/setup-linux-environment.sh diff --git a/.github/workflows/integrationtest2.yml b/.github/workflows/integrationtest2.yml index 69cfae1548..af4fe92197 100644 --- a/.github/workflows/integrationtest2.yml +++ b/.github/workflows/integrationtest2.yml @@ -23,6 +23,10 @@ jobs: uses: actions/setup-node@v3 with: node-version: 'v16.20.2' + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: '1.18.10' - name: Set up linux environment run: # installs development tools and updates .bash_profile bash test/integration/setup-linux-environment.sh diff --git a/.github/workflows/integrationtest3.yml b/.github/workflows/integrationtest3.yml index c8f3469cbe..e002c29926 100644 --- a/.github/workflows/integrationtest3.yml +++ b/.github/workflows/integrationtest3.yml @@ -23,6 +23,10 @@ jobs: uses: actions/setup-node@v3 with: node-version: 'v16.20.2' + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: '1.18.10' - name: Set up linux environment run: # installs development tools and updates .bash_profile bash test/integration/setup-linux-environment.sh diff --git a/test/integration/setup-linux-environment-root.sh b/test/integration/setup-linux-environment-root.sh index 6a8e508369..fcc32aff7e 100644 --- a/test/integration/setup-linux-environment-root.sh +++ b/test/integration/setup-linux-environment-root.sh @@ -28,7 +28,3 @@ groupadd -f docker usermod -aG docker ${dockeruser} curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod a+x /usr/local/bin/docker-compose - -# install go -wget -O /tmp/go.tar.gz https://golang.org/dl/go1.18.4.linux-amd64.tar.gz -sudo tar -C /usr/local -xzf /tmp/go.tar.gz diff --git a/test/integration/setup-linux-environment-user.sh b/test/integration/setup-linux-environment-user.sh index 8106b34c78..e464093fbe 100644 --- a/test/integration/setup-linux-environment-user.sh +++ b/test/integration/setup-linux-environment-user.sh @@ -15,11 +15,11 @@ npm install -g truffle @truffle/hdwallet-provider ganache-cli || true sudo npm install -g dotenv # set up environment vars in .bash_profile -echo 'export GOPATH=$HOME/go' >> ~/.bash_profile -echo 'export GOBIN=$GOPATH/bin' >> ~/.bash_profile -echo 'export GOROOT=/usr/local/go' >> ~/.bash_profile -echo 'export PATH=$GOROOT/bin:$PATH' >> ~/.bash_profile -echo 'export PATH=$GOBIN:$PATH' >> ~/.bash_profile +#echo 'export GOPATH=$HOME/go' >> ~/.bash_profile +#echo 'export GOBIN=$GOPATH/bin' >> ~/.bash_profile +#echo 'export GOROOT=/usr/local/go' >> ~/.bash_profile +#echo 'export PATH=$GOROOT/bin:$PATH' >> ~/.bash_profile +#echo 'export PATH=$GOBIN:$PATH' >> ~/.bash_profile echo 'export PATH=$HOME/.npm-global/bin:$PATH' >> ~/.bash_profile echo '. ~/.bash_profile' >> ~/.bashrc diff --git a/test/integration/setup-linux-environment.sh b/test/integration/setup-linux-environment.sh index 347d72924b..a49dafb5fd 100755 --- a/test/integration/setup-linux-environment.sh +++ b/test/integration/setup-linux-environment.sh @@ -9,3 +9,5 @@ scriptdir=$(dirname $0) sudo bash $scriptdir/setup-linux-environment-root.sh $(id -u -n) bash $scriptdir/setup-linux-environment-user.sh + +env | sort