Skip to content

Commit e9d1042

Browse files
committed
[release] merge master@8aab1a2 into release branch
Change-Id: Ib5639453c6e973e6f23c7e4711b0b5a3121012f3
2 parents 086d0cf + 8aab1a2 commit e9d1042

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+6533
-835
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/release-nightly.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,36 @@ jobs:
4040
- name: Compile
4141
run: npm run vscode:prepublish
4242

43+
# TODO: use prerelease versions of tools (how? or master?)
44+
4345
- name: Install Go tools (Modules mode)
4446
run: |
4547
go version
46-
go get github.com/acroca/go-symbols \
47-
github.com/davidrjenni/reftools/cmd/fillstruct \
48-
github.com/haya14busa/goplay/cmd/goplay \
49-
github.com/mdempsky/gocode \
50-
github.com/sqs/goreturns \
51-
github.com/uudashr/gopkgs/v2/cmd/gopkgs \
52-
github.com/zmb3/gogetdoc \
53-
golang.org/x/lint/golint \
54-
golang.org/x/tools/cmd/gorename \
55-
golang.org/x/tools/gopls
56-
48+
go get github.com/acroca/go-symbols
49+
go get github.com/davidrjenni/reftools/cmd/fillstruct
50+
go get github.com/haya14busa/goplay/cmd/goplay
51+
go get github.com/mdempsky/gocode
52+
go get github.com/sqs/goreturns
53+
go get github.com/uudashr/gopkgs/v2/cmd/gopkgs
54+
go get github.com/zmb3/gogetdoc
55+
go get golang.org/x/lint/golint
56+
go get golang.org/x/tools/cmd/gorename
57+
go get golang.org/x/tools/gopls
5758
env:
58-
GO111MODULE: on
59-
59+
GO111MODULE: on
60+
6061
- name: Install Go tools (GOPATH mode)
6162
run: |
6263
go version
63-
go get github.com/cweill/gotests/... \
64-
github.com/rogpeppe/godef \
65-
github.com/ramya-rao-a/go-outline
64+
go get github.com/cweill/gotests/...
65+
go get github.com/rogpeppe/godef
66+
go get github.com/ramya-rao-a/go-outline
6667
# Because some tests depend on the source code checked in GOPATH. TODO: FIX THEM.
6768
env:
6869
GO111MODULE: off
6970

70-
7171
- name: Run unit tests
7272
run: npm run unit-test
73-
continue-on-error: true
7473

7574
- name: Run tests
7675
uses: GabrielBB/[email protected]

.github/workflows/release.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ name: Release (golang.go)
2121
# the 'Release (golang.go)' workflow specified in this file.
2222
# - For stable version release (vX.X.X), check if the package.json has the matching version.
2323
# - Packaging using 'vsce package'
24-
# - Create a release in Github
24+
# - Create a release in GitHub
2525
# - Upload the vsix file as an asset of the release
2626
# - For stable version release (vX.X.X), upload to the vscode market place
27-
# (not implemented in this CL)
2827

2928
on:
3029
push:
3130
tags:
3231
- v*
3332

3433
jobs:
35-
build:
34+
release:
3635
name: create release
3736
runs-on: ubuntu-latest
37+
if: github.repository == 'golang/vscode-go'
3838

3939
steps:
4040
- name: checkout code
@@ -95,6 +95,14 @@ jobs:
9595
asset_path: ./go-${{ env.EXT_VERSION }}.vsix
9696
asset_name: go-${{ env.EXT_VERSION }}.vsix
9797
asset_content_type: application/zip
98+
99+
- name: publish
100+
if: env.EXT_ISPREVIEW != 1 && github.repository == 'golang/vscode-go'
101+
uses: lannonbr/vsce-action@704da577da0f27de5cdb4ae018374c2f08b5f523
102+
with:
103+
args: "publish -p $VSCE_TOKEN"
104+
env:
105+
VSCE_TOKEN: ${{ secrets.VSCE_TOKEN }}
106+
98107
# TODO: check if the commit is in green state. (test-long.yml results)
99-
# TODO: publish to the market if VERSION is for a stable version.
100108
# TODO: after publishing, create a gerrit CL to update 'latest' branch if VERSION is for a stable version.

.github/workflows/test-long.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969

7070
- name: Run unit tests
7171
run: npm run unit-test
72-
continue-on-error: true
7372

7473
- name: Run tests
7574
uses: GabrielBB/[email protected]

.github/workflows/test-smoke.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565

6666
- name: Run unit tests
6767
run: npm run unit-test
68-
continue-on-error: true
6968

7069
- name: Run tests
7170
uses: GabrielBB/[email protected]

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
out
2-
node_modules
3-
.vscode-test
1+
out/
2+
dist/
3+
node_modules/
4+
.vscode-test/
45
.DS_Store

.travis.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"version": "0.2.0",
33
"configurations": [
4-
54
{
65
"name": "Launch Extension",
76
"type": "extensionHost",
@@ -12,27 +11,45 @@
1211
"--extensionDevelopmentPath=${workspaceFolder}",
1312
"--disable-extensions"
1413
],
14+
"outFiles": [
15+
"${workspaceFolder}/dist/**/*.js"
16+
],
1517
"stopOnEntry": false,
1618
"sourceMaps": true,
19+
"smartStep": true,
20+
"preLaunchTask": "npm: webpack",
21+
},
22+
{
23+
"name": "Launch as server",
24+
"type": "node",
25+
"protocol": "inspector",
26+
"request": "launch",
27+
"program": "${workspaceFolder}/dist/debugAdapter.js",
28+
"args": [
29+
"--server=4711"
30+
],
1731
"outFiles": [
18-
"${workspaceFolder}/out/**/*.js"
32+
"${workspaceFolder}/dist/**/*.js"
1933
],
20-
"preLaunchTask": "npm: watch"
34+
"sourceMaps": true,
35+
"smartStep": true,
36+
"preLaunchTask": "npm: webpack"
2137
},
2238
{
23-
"name": "Launch as server",
39+
"name": "Launch as server (dlv dap)",
2440
"type": "node",
2541
"protocol": "inspector",
2642
"request": "launch",
27-
"program": "${workspaceFolder}/out/src/debugAdapter/goDebug.js",
43+
"program": "${workspaceFolder}/dist/debugAdapter2.js",
2844
"args": [
2945
"--server=4711"
3046
],
3147
"sourceMaps": true,
48+
"smartStep": true,
3249
"outFiles": [
33-
"${workspaceFolder}/out/**/*.js"
50+
"${workspaceFolder}/dist/**/*.js"
3451
],
35-
"preLaunchTask": "npm"
52+
"preLaunchTask": "npm: webpack"
3653
},
3754
{
3855
"name": "Launch Extension Tests",
@@ -49,6 +66,7 @@
4966
],
5067
"stopOnEntry": false,
5168
"sourceMaps": true,
69+
"smartStep": true,
5270
"outFiles": [
5371
"${workspaceFolder}/out/test/**/*.js"
5472
],
@@ -87,7 +105,8 @@
87105
"--colors",
88106
"${workspaceFolder}/out/test/unit"
89107
],
90-
"internalConsoleOptions": "openOnSessionStart"
108+
"internalConsoleOptions": "openOnSessionStart",
109+
"preLaunchTask": "npm: watch",
91110
},
92111
],
93112
"compounds": [
@@ -99,4 +118,4 @@
99118
]
100119
}
101120
]
102-
}
121+
}

.vscodeignore

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
src/**/*
2-
test/
3-
third_party/
4-
typings/**/*
5-
.vscode/**/*
6-
tsconfig.json
7-
.gitignore
8-
node_modules/fs-extra
91
**/*.map
102
**/tslint.json
11-
build/**/*
12-
docs/
13-
*.md.nightly
143
.github/**/*
4+
.gitignore
155
.prettierrc.json
16-
out/test/**
176
.vscode-test/**
7+
.vscode/
188
SECURITY.md
9+
build/
10+
docs/
11+
node_modules
12+
out/
13+
src/
14+
test/
15+
third_party/
16+
tools/
17+
tsconfig.json
18+
typings/
19+
webpack.config.js

docs/debugging.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,15 @@ The solution this issue differs based on your OS.
345345

346346
#### OSX
347347

348-
This usually happens on OSX due to signing issues. See the discussions in [Microsoft/vscode-go#717](https://github.com/Microsoft/vscode-go/issues/717), [Microsoft/vscode-go#269](https://github.com/Microsoft/vscode-go/issues/269) and [derekparker/delve#357](https://github.com/derekparker/delve/issues/357).
348+
This usually happens on OSX due to signing issues. See the discussions in [Microsoft/vscode-go#717](https://github.com/Microsoft/vscode-go/issues/717), [Microsoft/vscode-go#269](https://github.com/Microsoft/vscode-go/issues/269) and [go-delve/delve#357](https://github.com/go-delve/delve/issues/357).
349349

350-
**_Solution_**: You may have to uninstall dlv and install it manually as described in the [Delve instructions](https://github.com/derekparker/delve/blob/master/Documentation/installation/osx/install.md#manual-install).
350+
**_Solution_**: You may have to uninstall dlv and install it manually as described in the [Delve instructions](https://github.com/go-delve/delve/blob/master/Documentation/installation/osx/install.md#manual-install).
351351

352352
#### Linux/Docker
353353

354354
Docker has security settings preventing `ptrace(2)` operations by default within the container.
355355

356-
**_Solution_**: To run your container insecurely, pass `--security-opt=seccomp:unconfined` to `docker run`. See [derekparker/delve#515](https://github.com/derekparker/delve/issues/515) for references.
356+
**_Solution_**: To run your container insecurely, pass `--security-opt=seccomp:unconfined` to `docker run`. See [go-delve/delve#515](https://github.com/go-delve/delve/issues/515) for references.
357357

358358
#### could not launch process: exec: "lldb-server": executable file not found in $PATH
359359

0 commit comments

Comments
 (0)