diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 62f00b16c..053fd60db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,10 +56,7 @@ schedules: variables: - name: testVSCodeVersion - ${{ if eq( variables['Build.Reason'], 'Schedule' ) }}: - value: insiders - ${{ else }}: - value: stable + value: insiders stages: - template: azure-pipelines/build-vsix.yml diff --git a/azure-pipelines/profiling.yml b/azure-pipelines/profiling.yml index c55328c12..190b1ad27 100644 --- a/azure-pipelines/profiling.yml +++ b/azure-pipelines/profiling.yml @@ -56,5 +56,5 @@ extends: parameters: installDotNet: true npmCommand: profiling - testVSCodeVersion: stable + testVSCodeVersion: insiders isIntegration: true \ No newline at end of file diff --git a/test/vscodeLauncher.ts b/test/vscodeLauncher.ts index a4fdbf3dd..8627507a8 100644 --- a/test/vscodeLauncher.ts +++ b/test/vscodeLauncher.ts @@ -69,24 +69,7 @@ export async function prepareVSCodeAndExecuteTests( async function installExtensions(extensionIds: string[], vscodeCli: string, vscodeArgs: string[]): Promise { for (const extensionId of extensionIds) { - // Workaround for https://github.com/microsoft/vscode/issues/256031 to retry installing the extension with a delay. - let installError: any | undefined = undefined; - let installSucceeded = false; - for (let attempts = 0; attempts < 5; attempts++) { - try { - await installExtension(extensionId, vscodeCli, vscodeArgs); - installSucceeded = true; - break; - } catch (error) { - console.warn(`Failed to install extension ${extensionId}; retrying: ${error}`); - installError = error; - await new Promise((resolve) => setTimeout(resolve, 2000)); - } - } - - if (!installSucceeded) { - throw installError; - } + await installExtension(extensionId, vscodeCli, vscodeArgs); } console.log();