ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert source map publishing for build break (#20887)

Browse Source
This commit is contained in:
Karl Burtram
2022-10-20 00:12:51 -07:00
committed by GitHub
parent 21462e382d
commit d5bb8276ce
2 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/azure-pipelines/upload-sourcemaps.js
View File

@@ -10,11 +10,9 @@ const vfs = require("vinyl-fs");
const util = require("../lib/util"); const util = require("../lib/util");
// @ts-ignore // @ts-ignore
const deps = require("../lib/dependencies"); const deps = require("../lib/dependencies");
const identity_1 = require("@azure/identity");
const azure = require('gulp-azure-storage'); const azure = require('gulp-azure-storage');
const root = path.dirname(path.dirname(__dirname)); const root = path.dirname(path.dirname(__dirname));
const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; const commit = util.getVersion(root);
const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
// optionally allow to pass in explicit base/maps to upload // optionally allow to pass in explicit base/maps to upload
const [, , base, maps] = process.argv; const [, , base, maps] = process.argv;
function src(base, maps = `${base}/**/*.map`) { function src(base, maps = `${base}/**/*.map`) {
@@ -42,23 +40,16 @@ function main() {
else { else {
sources.push(src(base, maps)); sources.push(src(base, maps));
} }
return new Promise((c, e) => { return es.merge(...sources)
es.merge(...sources) .pipe(es.through(function (data) {
.pipe(es.through(function (data) { console.log('Uploading Sourcemap', data.relative); // debug
console.log('Uploading Sourcemap', data.relative); // debug this.emit('data', data);
this.emit('data', data); }))
})) .pipe(azure.upload({
.pipe(azure.upload({ account: process.env.AZURE_STORAGE_ACCOUNT,
account: process.env.AZURE_STORAGE_ACCOUNT, key: process.env.AZURE_STORAGE_ACCESS_KEY,
credential, container: 'sourcemaps',
container: 'sourcemaps', prefix: commit + '/'
prefix: commit + '/' }));
}))
.on('end', () => c())
.on('error', (err) => e(err));
});
} }
main().catch(err => { main();
console.error(err);
process.exit(1);
});

42
build/azure-pipelines/upload-sourcemaps.ts
View File

@@ -12,12 +12,10 @@ import * as vfs from 'vinyl-fs';
import * as util from '../lib/util'; import * as util from '../lib/util';
// @ts-ignore // @ts-ignore
import * as deps from '../lib/dependencies'; import * as deps from '../lib/dependencies';
import { ClientSecretCredential } from '@azure/identity';
const azure = require('gulp-azure-storage'); const azure = require('gulp-azure-storage');
const root = path.dirname(path.dirname(__dirname)); const root = path.dirname(path.dirname(__dirname));
const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; const commit = util.getVersion(root);
const credential = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!);
// optionally allow to pass in explicit base/maps to upload // optionally allow to pass in explicit base/maps to upload
const [, , base, maps] = process.argv; const [, , base, maps] = process.argv;
@@ -30,15 +28,15 @@ function src(base: string, maps = `${base}/**/*.map`) {
})); }));
} }
function main(): Promise<void> { function main() {
const sources: any[] = []; const sources = [];
// vscode client maps (default) // vscode client maps (default)
if (!base) { if (!base) {
const vs = src('out-vscode-min'); // client source-maps only const vs = src('out-vscode-min'); // client source-maps only
sources.push(vs); sources.push(vs);
const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root); const productionDependencies: { name: string, path: string, version: string }[] = deps.getProductionDependencies(root);
const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`); const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' }) const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore'))); .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
@@ -53,25 +51,17 @@ function main(): Promise<void> {
sources.push(src(base, maps)); sources.push(src(base, maps));
} }
return new Promise((c, e) => { return es.merge(...sources)
es.merge(...sources) .pipe(es.through(function (data: Vinyl) {
.pipe(es.through(function (data: Vinyl) { console.log('Uploading Sourcemap', data.relative); // debug
console.log('Uploading Sourcemap', data.relative); // debug this.emit('data', data);
this.emit('data', data); }))
})) .pipe(azure.upload({
.pipe(azure.upload({ account: process.env.AZURE_STORAGE_ACCOUNT,
account: process.env.AZURE_STORAGE_ACCOUNT, key: process.env.AZURE_STORAGE_ACCESS_KEY,
credential, container: 'sourcemaps',
container: 'sourcemaps', prefix: commit + '/'
prefix: commit + '/' }));
}))
.on('end', () => c())
.on('error', (err: any) => e(err));
});
} }
main().catch(err => { main();
console.error(err);
process.exit(1);
});