From fcf3534cec10235f6ddc93489ff1ff23fa67eccf Mon Sep 17 00:00:00 2001 From: rchiodo Date: Mon, 14 Sep 2020 16:40:01 -0700 Subject: [PATCH 1/3] Try different version of VS code in release --- build/ci/templates/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ci/templates/globals.yml b/build/ci/templates/globals.yml index 03457023e99e..8f08a899b975 100644 --- a/build/ci/templates/globals.yml +++ b/build/ci/templates/globals.yml @@ -11,3 +11,4 @@ variables: npm_config_cache: $(Pipeline.Workspace)/.npm vmImageMacOS: 'macOS-10.15' TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests). + VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed From 4bdf130462ed48b6f83f13336dd549026ed8e318 Mon Sep 17 00:00:00 2001 From: rchiodo Date: Mon, 14 Sep 2020 17:02:09 -0700 Subject: [PATCH 2/3] Change to make it use the actual variable --- src/test/standardTest.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/standardTest.ts b/src/test/standardTest.ts index 4a6dd9f2e287..76739ae4b667 100644 --- a/src/test/standardTest.ts +++ b/src/test/standardTest.ts @@ -16,9 +16,7 @@ const extensionDevelopmentPath = process.env.CODE_EXTENSIONS_PATH ? process.env.CODE_EXTENSIONS_PATH : EXTENSION_ROOT_DIR_FOR_TESTS; -const channel = (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || '').toLowerCase().includes('insiders') - ? 'insiders' - : 'stable'; +const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable'; function start() { console.log('*'.repeat(100)); From 592ff48b527fe8ef030c6b7db2d60709e1a7a7cc Mon Sep 17 00:00:00 2001 From: rchiodo Date: Mon, 14 Sep 2020 17:02:31 -0700 Subject: [PATCH 3/3] Use a real version --- build/ci/templates/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/templates/globals.yml b/build/ci/templates/globals.yml index 8f08a899b975..98bd51685dd0 100644 --- a/build/ci/templates/globals.yml +++ b/build/ci/templates/globals.yml @@ -11,4 +11,4 @@ variables: npm_config_cache: $(Pipeline.Workspace)/.npm vmImageMacOS: 'macOS-10.15' TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests). - VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed + VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48.0' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed