mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Compile build folder (#22811)
* Compile build folder * Fix build compile issues (#22813) * Revert changes * Update gulp-shell * Test * Update * Update modifiers * Try reverting minimist * Generates linux deb artifact (#22922) * Remove deb files that were brought in with the latest merge. * Add debian back to linux gulp file * Remove async from anonymous function. * Remove run core integration tests build step in pipeline * Revert "Remove async from anonymous function." This reverts commit 7ad1ce2942954fce58939b9965343b46b9311a7e. * Revert "Add debian back to linux gulp file" This reverts commit 96b7c0f0995c8024ef67ed886da34255a5caa325. * Revert "Remove deb files that were brought in with the latest merge." This reverts commit bf3aae233b8da1f9111a149a96d77cc78d376094. * Removes dependency checks * Fix dependency gen errors * Reenable "Build Deb" step * Reenable publish deb * Run core integration tests * Revert "Run core integration tests" This reverts commit 7cafbada194feebe771862af796fb3416b5dd686. * Revert "Try reverting minimist" This reverts commit 38fd843c1d5c33318a92f4bbc7057e951c5a9f71. * Disable code coverage step intermin --------- Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: Lewis Sanchez <87730006+lewis-sanchez@users.noreply.github.com>
This commit is contained in:
@@ -16,13 +16,13 @@ const dep_lists_1 = require("./dep-lists");
|
||||
// If true, we fail the build if there are new dependencies found during that task.
|
||||
// The reference dependencies, which one has to update when the new dependencies
|
||||
// are valid, are in dep-lists.ts
|
||||
const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
|
||||
// const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
|
||||
function getDependencies(buildDir, applicationName, arch) {
|
||||
// Get the files for which we want to find dependencies.
|
||||
const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
|
||||
const findResult = (0, child_process_1.spawnSync)('find', [nativeModulesPath, '-name', '*.node']);
|
||||
if (findResult.status) {
|
||||
console.error('Error finding files:');
|
||||
console.error(`Error finding files for ${arch}:`);
|
||||
console.error(findResult.stderr.toString());
|
||||
return [];
|
||||
}
|
||||
@@ -48,18 +48,19 @@ function getDependencies(buildDir, applicationName, arch) {
|
||||
sortedDependencies = sortedDependencies.filter(dependency => {
|
||||
return !dep_lists_1.bundledDeps.some(bundledDep => dependency.startsWith(bundledDep));
|
||||
});
|
||||
const referenceGeneratedDeps = dep_lists_1.referenceGeneratedDepsByArch[arch];
|
||||
/* {{SQL CARBON EDIT}} - Not needed for SQL
|
||||
const referenceGeneratedDeps = referenceGeneratedDepsByArch[arch];
|
||||
if (JSON.stringify(sortedDependencies) !== JSON.stringify(referenceGeneratedDeps)) {
|
||||
const failMessage = 'The dependencies list has changed. '
|
||||
+ 'Printing newer dependencies list that one can use to compare against referenceGeneratedDeps:\n'
|
||||
+ sortedDependencies.join('\n');
|
||||
if (FAIL_BUILD_FOR_NEW_DEPENDENCIES) {
|
||||
throw new Error(failMessage);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
console.warn(failMessage);
|
||||
}
|
||||
}
|
||||
*/
|
||||
return sortedDependencies;
|
||||
}
|
||||
exports.getDependencies = getDependencies;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import { spawnSync } from 'child_process';
|
||||
import { constants, statSync } from 'fs';
|
||||
import path = require('path');
|
||||
import { additionalDeps, bundledDeps, referenceGeneratedDepsByArch } from './dep-lists';
|
||||
import { additionalDeps, bundledDeps } from './dep-lists';
|
||||
import { ArchString } from './types';
|
||||
|
||||
// A flag that can easily be toggled.
|
||||
@@ -16,14 +16,14 @@ import { ArchString } from './types';
|
||||
// If true, we fail the build if there are new dependencies found during that task.
|
||||
// The reference dependencies, which one has to update when the new dependencies
|
||||
// are valid, are in dep-lists.ts
|
||||
const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
|
||||
// const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
|
||||
|
||||
export function getDependencies(buildDir: string, applicationName: string, arch: ArchString): string[] {
|
||||
// Get the files for which we want to find dependencies.
|
||||
const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
|
||||
const findResult = spawnSync('find', [nativeModulesPath, '-name', '*.node']);
|
||||
if (findResult.status) {
|
||||
console.error('Error finding files:');
|
||||
console.error(`Error finding files for ${arch}:`);
|
||||
console.error(findResult.stderr.toString());
|
||||
return [];
|
||||
}
|
||||
@@ -57,6 +57,7 @@ export function getDependencies(buildDir: string, applicationName: string, arch:
|
||||
return !bundledDeps.some(bundledDep => dependency.startsWith(bundledDep));
|
||||
});
|
||||
|
||||
/* {{SQL CARBON EDIT}} - Not needed for SQL
|
||||
const referenceGeneratedDeps = referenceGeneratedDepsByArch[arch];
|
||||
if (JSON.stringify(sortedDependencies) !== JSON.stringify(referenceGeneratedDeps)) {
|
||||
const failMessage = 'The dependencies list has changed. '
|
||||
@@ -68,7 +69,7 @@ export function getDependencies(buildDir: string, applicationName: string, arch:
|
||||
console.warn(failMessage);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
return sortedDependencies;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user