From fb97bf6041c0fd5a1f0e79c35f313384bd79fc8f Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Thu, 23 May 2019 16:55:37 -0700 Subject: [PATCH] Don't fail build with vsix directory exists (#5593) * Don't fail build with vsix directory exists * Add a !fs.exists call prior to mkdir --- build/lib/extensions.js | 10 +++++++++- build/lib/extensions.ts | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build/lib/extensions.js b/build/lib/extensions.js index b16f7cad4a..e1493242aa 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -41,7 +41,15 @@ function packageBuiltInExtensions() { .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0); const visxDirectory = path.join(path.dirname(root), 'vsix'); - fs.mkdirSync(visxDirectory); + try { + if (!fs.existsSync(visxDirectory)) { + fs.mkdirSync(visxDirectory); + } + } + catch (err) { + // don't fail the build if the output directory already exists + console.warn(err); + } sqlBuiltInLocalExtensionDescriptions.forEach(element => { let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' })); const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`); diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts index 5262045a8f..2524c917b9 100644 --- a/build/lib/extensions.ts +++ b/build/lib/extensions.ts @@ -44,7 +44,14 @@ export function packageBuiltInExtensions() { .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0); const visxDirectory = path.join(path.dirname(root), 'vsix'); - fs.mkdirSync(visxDirectory); + try { + if (!fs.existsSync(visxDirectory)) { + fs.mkdirSync(visxDirectory); + } + } catch (err) { + // don't fail the build if the output directory already exists + console.warn(err); + } sqlBuiltInLocalExtensionDescriptions.forEach(element => { let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' })); const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);