Skip to content

Commit

Permalink
.github/workflows: install stable delve version for testing
Browse files Browse the repository at this point in the history
The extension maintains two dlv binaries for debugging, a stable
version of dlv for the legacy adapater and dlv built from master
to be used with dlv dap, which is under active development. For
testing we should use the stable version of delve for the legacy,
and only use master for dlv-dap.

Updates golang#1456

Change-Id: Ie4482aebb4fee1579896702faca207182b4746c3
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/314389
Trust: Suzy Mueller <suzmue@golang.org>
Run-TryBot: Suzy Mueller <suzmue@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
  • Loading branch information
suzmue authored and lggomez committed May 6, 2021
1 parent ab74bbc commit 6b32df1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
go get github.com/ramya-rao-a/go-outline
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
env:
GO111MODULE: on
EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-long-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
go get github.com/ramya-rao-a/go-outline
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
env:
GO111MODULE: on
EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-long.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
go get github.com/ramya-rao-a/go-outline
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
env:
GO111MODULE: on
EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
go get github.com/ramya-rao-a/go-outline
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
env:
GO111MODULE: on
EXT: "${{ matrix.os == 'windows-latest' && '.exe' || ''}}"
Expand Down
7 changes: 3 additions & 4 deletions test/integration/goDebug.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -877,8 +877,7 @@ const testAll = (ctx: Mocha.Context, isDlvDap: boolean) => {
});
});

// Temporarily disabled to unblock nightly release. (https://github.com/golang/vscode-go/issues/1456)
suite.skip('remote attach', () => {
suite('remote attach', () => {
let childProcess: cp.ChildProcess;
let server: number;
let debugConfig: DebugConfiguration;
Expand Down Expand Up @@ -976,7 +975,7 @@ const testAll = (ctx: Mocha.Context, isDlvDap: boolean) => {
await dc.hitBreakpoint(debugConfig, getBreakpointLocation(FILE, BREAKPOINT_LINE));
});

test.skip('stopped for a breakpoint set during initialization (remote attach)', async function () {
test('stopped for a breakpoint set during initialization (remote attach)', async function () {
if (isDlvDap && dlvDapSkipsEnabled) {
this.skip(); // not working in dlv-dap.
}
Expand All @@ -1001,7 +1000,7 @@ const testAll = (ctx: Mocha.Context, isDlvDap: boolean) => {
await new Promise((resolve) => setTimeout(resolve, 2_000));
});

test.skip('stopped for a breakpoint set after initialization (remote attach)', async function () {
test('stopped for a breakpoint set after initialization (remote attach)', async function () {
if (isDlvDap && dlvDapSkipsEnabled) {
this.skip(); // not working in dlv-dap.
}
Expand Down

0 comments on commit 6b32df1

Please sign in to comment.