提交 3cfe1739 编写于 作者: M Martin Aeschlimann

build script: log dowload finished

上级 d5b94eb3
...@@ -514,7 +514,7 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], () ...@@ -514,7 +514,7 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], ()
const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' }); const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' }); const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });
return es.merge(vs, extensionsOut, extensionsDist) const res = es.merge(vs, extensionsOut, extensionsDist)
.pipe(es.through(function (data) { .pipe(es.through(function (data) {
// debug // debug
console.log('Uploading Sourcemap', data.relative); console.log('Uploading Sourcemap', data.relative);
...@@ -526,6 +526,14 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], () ...@@ -526,6 +526,14 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], ()
container: 'sourcemaps', container: 'sourcemaps',
prefix: commit + '/' prefix: commit + '/'
})); }));
res.on('error', (err) => {
console.log('ERROR uploading sourcemaps');
console.error(err);
});
res.on('end', () => {
console.log('Completed uploading sourcemaps');
});
return res;
}); });
const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json'); const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
......
...@@ -150,11 +150,6 @@ function fromLocalNormal(extensionPath) { ...@@ -150,11 +150,6 @@ function fromLocalNormal(extensionPath) {
.catch(function (err) { return result.emit('error', err); }); .catch(function (err) { return result.emit('error', err); });
return result.pipe(stats_1.createStatsStream(path.basename(extensionPath))); return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
} }
function error(err) {
var result = es.through();
setTimeout(function () { return result.emit('error', err); });
return result;
}
var baseHeaders = { var baseHeaders = {
'X-Market-Client-Id': 'VSCode Build', 'X-Market-Client-Id': 'VSCode Build',
'User-Agent': 'VSCode Build', 'User-Agent': 'VSCode Build',
...@@ -173,6 +168,13 @@ function fromMarketplace(extensionName, version, metadata) { ...@@ -173,6 +168,13 @@ function fromMarketplace(extensionName, version, metadata) {
}; };
var packageJsonFilter = filter('package.json', { restore: true }); var packageJsonFilter = filter('package.json', { restore: true });
return remote('', options) return remote('', options)
.on('error', function (err) {
console.log('Error downloading extension:', util.colors.yellow(extensionName + "@" + version));
console.error(err);
})
.on('end', function () {
console.log('Downloaded extension:', util.colors.yellow(extensionName + "@" + version));
})
.pipe(vzip.src()) .pipe(vzip.src())
.pipe(filter('extension/**')) .pipe(filter('extension/**'))
.pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); })) .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
......
...@@ -174,12 +174,6 @@ function fromLocalNormal(extensionPath: string): Stream { ...@@ -174,12 +174,6 @@ function fromLocalNormal(extensionPath: string): Stream {
return result.pipe(createStatsStream(path.basename(extensionPath))); return result.pipe(createStatsStream(path.basename(extensionPath)));
} }
function error(err: any): Stream {
const result = es.through();
setTimeout(() => result.emit('error', err));
return result;
}
const baseHeaders = { const baseHeaders = {
'X-Market-Client-Id': 'VSCode Build', 'X-Market-Client-Id': 'VSCode Build',
'User-Agent': 'VSCode Build', 'User-Agent': 'VSCode Build',
...@@ -203,6 +197,13 @@ export function fromMarketplace(extensionName: string, version: string, metadata ...@@ -203,6 +197,13 @@ export function fromMarketplace(extensionName: string, version: string, metadata
const packageJsonFilter = filter('package.json', { restore: true }); const packageJsonFilter = filter('package.json', { restore: true });
return remote('', options) return remote('', options)
.on('error', function (err) {
console.log('Error downloading extension:', util.colors.yellow(extensionName + "@" + version));
console.error(err);
})
.on('end', function () {
console.log('Downloaded extension:', util.colors.yellow(extensionName + "@" + version));
})
.pipe(vzip.src()) .pipe(vzip.src())
.pipe(filter('extension/**')) .pipe(filter('extension/**'))
.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, ''))) .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册