mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -23,14 +23,14 @@ function getDownloadUrl(updateUrl: string, commit: string, platform: string, qua
|
||||
return `${updateUrl}/commit:${commit}/server-${platform}/${quality}`;
|
||||
}
|
||||
|
||||
async function downloadVSCodeServerArchive(updateUrl: string, commit: string, quality: string, destDir: string): Promise<string> {
|
||||
async function downloadVSCodeServerArchive(updateUrl: string, commit: string, quality: string, destDir: string, log: (messsage: string) => void): Promise<string> {
|
||||
ensureFolderExists(destDir);
|
||||
|
||||
const platform = process.platform === 'win32' ? 'win32-x64' : process.platform === 'darwin' ? 'darwin' : 'linux-x64';
|
||||
const downloadUrl = getDownloadUrl(updateUrl, commit, platform, quality);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
console.log(`Downloading VS Code Server from: ${downloadUrl}`);
|
||||
log(`Downloading VS Code Server from: ${downloadUrl}`);
|
||||
const requestOptions: https.RequestOptions = parseUrl(downloadUrl);
|
||||
|
||||
https.get(requestOptions, res => {
|
||||
@@ -70,9 +70,10 @@ async function downloadVSCodeServerArchive(updateUrl: string, commit: string, qu
|
||||
/**
|
||||
* Unzip a .zip or .tar.gz VS Code archive
|
||||
*/
|
||||
function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string) {
|
||||
function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string, destDir: string, log: (messsage: string) => void) {
|
||||
log(`Extracting ${vscodeArchivePath}`);
|
||||
if (vscodeArchivePath.endsWith('.zip')) {
|
||||
const tempDir = fs.mkdtempSync('vscode-server');
|
||||
const tempDir = fs.mkdtempSync(path.join(destDir, 'vscode-server-extract'));
|
||||
if (process.platform === 'win32') {
|
||||
cp.spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
@@ -95,17 +96,17 @@ function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: string, quality: string = 'stable', destDir: string): Promise<string> {
|
||||
export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: string, quality: string = 'stable', destDir: string, log: (messsage: string) => void): Promise<string> {
|
||||
|
||||
const extractDir = path.join(destDir, commit);
|
||||
if (fs.existsSync(extractDir)) {
|
||||
console.log(`Found ${extractDir}. Skipping download.`);
|
||||
log(`Found ${extractDir}. Skipping download.`);
|
||||
} else {
|
||||
console.log(`Downloading VS Code Server ${quality} - ${commit} into ${extractDir}.`);
|
||||
log(`Downloading VS Code Server ${quality} - ${commit} into ${extractDir}.`);
|
||||
try {
|
||||
const vscodeArchivePath = await downloadVSCodeServerArchive(updateUrl, commit, quality, destDir);
|
||||
const vscodeArchivePath = await downloadVSCodeServerArchive(updateUrl, commit, quality, destDir, log);
|
||||
if (fs.existsSync(vscodeArchivePath)) {
|
||||
unzipVSCodeServer(vscodeArchivePath, extractDir);
|
||||
unzipVSCodeServer(vscodeArchivePath, extractDir, destDir, log);
|
||||
// Remove archive
|
||||
fs.unlinkSync(vscodeArchivePath);
|
||||
}
|
||||
@@ -114,4 +115,4 @@ export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: st
|
||||
}
|
||||
}
|
||||
return Promise.resolve(extractDir);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user