From 65713160cbbd72629abda4985206015535a42da3 Mon Sep 17 00:00:00 2001 From: Suzy Mueller Date: Thu, 6 May 2021 11:02:44 -0400 Subject: [PATCH] .github/workflows: move dlv to dlv-dap before getting dlv again From the install logs, only a single version of delve is installed: go: downloading github.com/go-delve/delve v1.6.1-0.20210504195617-c5d58f494a26 go: downloading github.com/sirupsen/logrus v1.6.0 go: downloading github.com/spf13/cobra v0.0.0-20170417170307-b6cb39589372 go: downloading github.com/mattn/go-isatty v0.0.3 go: downloading github.com/cpuguy83/go-md2man v1.0.10 go: downloading github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1 go: downloading gopkg.in/yaml.v2 v2.2.4 go: downloading github.com/konsorten/go-windows-terminal-sequences v1.0.3 go: downloading github.com/cosiner/argv v0.1.0 go: downloading github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561 go: downloading github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b go: downloading github.com/google/go-dap v0.5.0 go: downloading github.com/inconshreveable/mousetrap v1.0.0 go: downloading github.com/russross/blackfriday v1.5.2 go: downloading github.com/hashicorp/golang-lru v0.5.4 go: downloading golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 go: downloading go.starlark.net v0.0.0-20200821142938-949cc6f4b097 go: downloading github.com/russross/blackfriday v1.6.0 go get: added github.com/go-delve/delve v1.6.1-0.20210504195617-c5d58f494a26 Specify @latest for the stable version of delve. Change-Id: I403721e47df1cb4c306dbc2369723d52d9af6c47 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/317662 Trust: Suzy Mueller Run-TryBot: Suzy Mueller Reviewed-by: Hyang-Ah Hana Kim --- .github/workflows/test-long-all.yml | 5 +++-- .github/workflows/test-long.yml | 5 +++-- .github/workflows/test-smoke.yml | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-long-all.yml b/.github/workflows/test-long-all.yml index b47da3f360..5bf2cc84a7 100644 --- a/.github/workflows/test-long-all.yml +++ b/.github/workflows/test-long-all.yml @@ -59,9 +59,10 @@ jobs: go get github.com/cweill/gotests/... go get github.com/rogpeppe/godef go get github.com/ramya-rao-a/go-outline + # Install two versions of dlv (one as dlv-dap) go get github.com/go-delve/delve/cmd/dlv@master - cp "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" - go get github.com/go-delve/delve/cmd/dlv + mv "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" + go get github.com/go-delve/delve/cmd/dlv@latest env: GO111MODULE: on EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}" diff --git a/.github/workflows/test-long.yml b/.github/workflows/test-long.yml index 7f450b4c84..eba0f60016 100644 --- a/.github/workflows/test-long.yml +++ b/.github/workflows/test-long.yml @@ -58,9 +58,10 @@ jobs: go get github.com/cweill/gotests/... go get github.com/rogpeppe/godef go get github.com/ramya-rao-a/go-outline + # Install two versions of dlv (one as dlv-dap) go get github.com/go-delve/delve/cmd/dlv@master - cp "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" - go get github.com/go-delve/delve/cmd/dlv + mv "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" + go get github.com/go-delve/delve/cmd/dlv@latest env: GO111MODULE: on EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}" diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 83ce5a714f..89fe48b668 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -56,9 +56,10 @@ jobs: go get github.com/cweill/gotests/... go get github.com/rogpeppe/godef go get github.com/ramya-rao-a/go-outline + # Install two versions of dlv (one as dlv-dap) go get github.com/go-delve/delve/cmd/dlv@master - cp "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" - go get github.com/go-delve/delve/cmd/dlv + mv "${HOME}/go/bin/dlv${{env.EXT}}" "${HOME}/go/bin/dlv-dap${{env.EXT}}" + go get github.com/go-delve/delve/cmd/dlv@latest env: GO111MODULE: on EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}"