Skip to content

Commit 505ad8d

Browse files
committed
build/all.bash: use go install for tool installation
In kokoro, we use only 1.16 which has `go install` support. vscode-go repo has go.mod, so we can't use `go get` for clean install. Alternatively we can try to use a temp directory (without go.mod) as a working directory for tools installation. That's how we do in github action where we also have testings running with go 1.15. Change-Id: I44626b2889be61fe49ad59ba3f2eb9dbf98949b0 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/322990 Trust: Hyang-Ah Hana Kim <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]> Reviewed-by: Suzy Mueller <[email protected]>
1 parent e7c91ef commit 505ad8d

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

.github/workflows/test-long.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- name: Compile
4040
run: npm run vscode:prepublish
4141

42+
# TODO: use `go install` when we all move to 1.16+ (see build/all.bash)
4243
- name: Install Go tools (Modules mode)
4344
run: |
4445
go version

build/all.bash

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,27 @@ install_dependencies() {
9999
local TARGET="${GOBIN}"
100100
if [[ -z "${GOBIN}" ]]; then TARGET="${GOPATHS%%:*}/bin" ; fi
101101

102-
GO111MODULE=on go get golang.org/x/tools/gopls
103-
GO111MODULE=on go get github.com/acroca/go-symbols
104-
GO111MODULE=on go get github.com/cweill/gotests/...
105-
GO111MODULE=on go get github.com/davidrjenni/reftools/cmd/fillstruct
106-
GO111MODULE=on go get github.com/haya14busa/goplay/cmd/goplay
102+
GO111MODULE=on go install golang.org/x/tools/gopls@latest
103+
GO111MODULE=on go install github.com/acroca/go-symbols@latest
104+
GO111MODULE=on go install github.com/cweill/gotests/gotests@latest
105+
GO111MODULE=on go install github.com/davidrjenni/reftools/cmd/fillstruct@latest
106+
GO111MODULE=on go install github.com/haya14busa/goplay/cmd/goplay@latest
107107

108108
# We install two versions of gocode, one for module mode (gocode-gomod)
109109
# and another for GOPATH mode (gocode).
110-
GO111MODULE=on go get github.com/stamblerre/gocode && mv "${TARGET}/gocode" "${TARGET}/gocode-gomod"
111-
GO111MODULE=on go get github.com/mdempsky/gocode
112-
113-
GO111MODULE=on go get github.com/ramya-rao-a/go-outline
114-
GO111MODULE=on go get github.com/rogpeppe/godef
115-
GO111MODULE=on go get github.com/sqs/goreturns
116-
GO111MODULE=on go get github.com/uudashr/gopkgs/v2/cmd/gopkgs
117-
GO111MODULE=on go get github.com/zmb3/gogetdoc
118-
GO111MODULE=on go get honnef.co/go/tools/...
119-
GO111MODULE=on go get golang.org/x/tools/cmd/gorename
120-
121-
GO111MODULE=on go get github.com/go-delve/delve/cmd/dlv@master && cp "${TARGET}/dlv" "${TARGET}/dlv-dap"
110+
GO111MODULE=on go install github.com/stamblerre/gocode@latest && mv "${TARGET}/gocode" "${TARGET}/gocode-gomod"
111+
GO111MODULE=on go install github.com/mdempsky/gocode@latest
112+
113+
GO111MODULE=on go install github.com/ramya-rao-a/go-outline@latest
114+
GO111MODULE=on go install github.com/rogpeppe/godef@latest
115+
GO111MODULE=on go install github.com/sqs/goreturns@latest
116+
GO111MODULE=on go install github.com/uudashr/gopkgs/v2/cmd/gopkgs@latest
117+
GO111MODULE=on go install github.com/zmb3/gogetdoc@latest
118+
GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@latest
119+
GO111MODULE=on go install golang.org/x/tools/cmd/gorename@latest
120+
121+
GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@master && cp "${TARGET}/dlv" "${TARGET}/dlv-dap"
122+
GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest
122123
}
123124

124125
main() {

0 commit comments

Comments
 (0)