From 2cbc8fce962ffcbc4e055592035b4d3f403c0948 Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Wed, 21 Feb 2024 15:09:51 -0500 Subject: [PATCH 1/2] [release] extension/src/goMain: skip vscgo installation on windows And, pass `-trimpath` when building it so the executable file hash is stable. And increase the vscgo test timeout. Fixes golang/vscode-go#3182 Change-Id: Ib86bf07ddc4a89849bb778b2621268b334f3a80a Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/565679 Reviewed-by: Peter Weinberger kokoro-CI: kokoro Commit-Queue: Hyang-Ah Hana Kim Reviewed-by: Robert Findley (cherry picked from commit 0b3fabc4c832194f59ca913f36f048aecd1f78ae) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/565680 Auto-Submit: Hyang-Ah Hana Kim --- extension/CHANGELOG.md | 7 +++++++ extension/src/goInstallTools.ts | 2 +- extension/src/goMain.ts | 21 ++++++++++++--------- extension/test/gopls/telemetry.test.ts | 4 +--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/extension/CHANGELOG.md b/extension/CHANGELOG.md index e7c2527f46..6f4f3db44b 100644 --- a/extension/CHANGELOG.md +++ b/extension/CHANGELOG.md @@ -1,3 +1,10 @@ +## v0.41.1 - 22 Feb, 2024 + +This release is a point release to skip `vscgo` installation on Windows +([Issue 3182](https://github.com/golang/vscode-go/issues/3182)). +For a detailed list of changes, refer to the complete +[commit history](https://github.com/golang/vscode-go/compare/v0.41.0...v0.41.1). + ## v0.41.0 - 14 Feb, 2024 This release introduces significant updates to the extension's UI. diff --git a/extension/src/goInstallTools.ts b/extension/src/goInstallTools.ts index 8d570c7949..490e77573c 100644 --- a/extension/src/goInstallTools.ts +++ b/extension/src/goInstallTools.ts @@ -893,7 +893,7 @@ export async function maybeInstallVSCGO( : `@v${extensionVersion}`; // build from source acquired from the module proxy if this is a non-preview version. try { - const args = ['install', `${importPath}${version}`]; + const args = ['install', '-trimpath', `${importPath}${version}`]; console.log(`installing vscgo: ${args.join(' ')}`); await execFile(getBinPath('go'), args, { cwd, env }); return progPath; diff --git a/extension/src/goMain.ts b/extension/src/goMain.ts index b1221e4bbb..73265bdd85 100644 --- a/extension/src/goMain.ts +++ b/extension/src/goMain.ts @@ -102,15 +102,18 @@ export async function activate(ctx: vscode.ExtensionContext): Promise telemetryReporter.setTool(path)) - .catch((reason) => console.error(reason)); + if (process.platform !== 'win32') { + // skip windows until Windows Defender issue reported in golang/vscode-go#3182 can be addressed + maybeInstallVSCGO( + ctx.extensionMode, + ctx.extension.id, + extensionInfo.version || '', + ctx.extensionPath, + extensionInfo.isPreview + ) + .then((path) => telemetryReporter.setTool(path)) + .catch((reason) => console.error(reason)); + } const registerCommand = commands.createRegisterCommand(ctx, goCtx); registerCommand('go.languageserver.restart', commands.startLanguageServer); diff --git a/extension/test/gopls/telemetry.test.ts b/extension/test/gopls/telemetry.test.ts index 6f409d1938..32dc1fcbc7 100644 --- a/extension/test/gopls/telemetry.test.ts +++ b/extension/test/gopls/telemetry.test.ts @@ -173,9 +173,7 @@ function testTelemetryPrompt(tc: testCase, wantPrompt: boolean) { } describe('# telemetry reporter using vscgo', async function () { - if (os.platform() === 'win32') { - this.timeout(10000); // go install is slow on windows builder. - } + this.timeout(10000); // go install can be slow. // installVSCGO expects // {extensionPath}/vscgo: vscgo source code for testing. // {extensionPath}/bin: where compiled vscgo will be stored. From 2ba3f688d16dc73a80618c17aa426a34ebc41d87 Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Wed, 21 Feb 2024 16:12:24 -0500 Subject: [PATCH 2/2] [release] prepare v0.41.1 release For golang/vscode-go#3185 Change-Id: I5b1d17940890a52e6e7977e2ff69c558eb60ad34 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/565681 Reviewed-by: Robert Findley Commit-Queue: Hyang-Ah Hana Kim kokoro-CI: kokoro --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extension/package-lock.json b/extension/package-lock.json index c7f428ab6e..a3e7a1aa81 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "go", - "version": "0.41.0", + "version": "0.41.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "go", - "version": "0.41.0", + "version": "0.41.1", "license": "MIT", "dependencies": { "diff": "4.0.2", diff --git a/extension/package.json b/extension/package.json index 8c5ae26a17..d6413d11ec 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,7 +1,7 @@ { "name": "go", "displayName": "Go", - "version": "0.41.0", + "version": "0.41.1", "publisher": "golang", "description": "Rich Go language support for Visual Studio Code", "author": {