Skip to content

Commit 583f2d3

Browse files
authored
bundle envs ext with stable (#25309)
reverts 8c3a49f which switched to only bundling with pre-release so now it is bundled for stable and pre-release
1 parent cce890f commit 583f2d3

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

.github/actions/build-vsix/action.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,8 @@ runs:
7070
shell: bash
7171

7272
- name: Update optional extension dependencies
73-
run: |
74-
if [[ "${VSIX_NAME}" == *"insiders"* ]]; then
75-
npm run addExtensionPackDependenciesPreRelease
76-
else
77-
npm run addExtensionPackDependencies
78-
fi
73+
run: npm run addExtensionPackDependencies
7974
shell: bash
80-
env:
81-
VSIX_NAME: ${{ inputs.vsix_name }}
8275

8376
- name: Build Webpack
8477
run: |

build/azure-pipeline.pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ extends:
9191
- script: python ./build/update_package_file.py
9292
displayName: Update telemetry in package.json
9393

94-
- script: npm run addExtensionPackDependenciesPreRelease
94+
- script: npm run addExtensionPackDependencies
9595
displayName: Update optional extension dependencies
9696

9797
- script: npx gulp prePublishBundle

gulpfile.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,16 @@ gulp.task('addExtensionPackDependencies', async () => {
9393
await addExtensionPackDependencies();
9494
});
9595

96-
// This task adds 'ms-python.vscode-python-envs' as required deps only for pre-release builds.
97-
gulp.task('addExtensionPackDependenciesPreRelease', async () => {
98-
await buildLicense();
99-
await addExtensionPackDependencies(true);
100-
});
101-
102-
async function addExtensionPackDependencies(isPreRelease = false) {
96+
async function addExtensionPackDependencies() {
10397
// Update the package.json to add extension pack dependencies at build time so that
10498
// extension dependencies need not be installed during development
10599
const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8');
106100
const packageJson = JSON.parse(packageJsonContents);
107-
let deps = ['ms-python.vscode-pylance', 'ms-python.debugpy'];
108-
if (isPreRelease) {
109-
deps.push('ms-python.vscode-python-envs');
110-
}
111-
packageJson.extensionPack = deps.concat(packageJson.extensionPack ? packageJson.extensionPack : []);
112-
101+
packageJson.extensionPack = [
102+
'ms-python.vscode-pylance',
103+
'ms-python.debugpy',
104+
'ms-python.vscode-python-envs',
105+
].concat(packageJson.extensionPack ? packageJson.extensionPack : []);
113106
// Remove potential duplicates.
114107
packageJson.extensionPack = packageJson.extensionPack.filter(
115108
(item, index) => packageJson.extensionPack.indexOf(item) === index,

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,6 @@
16891689
"format-fix": "prettier --write 'src/**/*.ts' 'build/**/*.js' '.github/**/*.yml' gulpfile.js",
16901690
"clean": "gulp clean",
16911691
"addExtensionPackDependencies": "gulp addExtensionPackDependencies",
1692-
"addExtensionPackDependenciesPreRelease": "gulp addExtensionPackDependenciesPreRelease",
16931692
"updateBuildNumber": "gulp updateBuildNumber",
16941693
"verifyBundle": "gulp verifyBundle",
16951694
"webpack": "webpack"

0 commit comments

Comments
 (0)