From 724731fddc8a2e31298ff68f9da70e89f734b865 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 10 Jul 2019 00:14:18 -0700 Subject: [PATCH] merge all dist folders into one --- .../grafana-toolkit/src/cli/tasks/plugin.ci.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts index 5466c8b70b9..99628288ff1 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts @@ -108,14 +108,19 @@ export const ciBuildPluginTask = new Task('Build Plugin', build const bundlePluginRunner: TaskRunner = async () => { const start = Date.now(); const workDir = getWorkFolder(); - let distDir = path.resolve(workDir, 'build', 'dist'); - if (!fs.existsSync(distDir)) { - distDir = `${process.cwd()}/dist`; - if (!fs.existsSync(distDir)) { - throw new Error('Dist folder does not exist: ' + distDir); + + // Copy all `dist` folders to a single dist folder + const distDir = path.resolve(workDir, 'dist'); + fs.mkdirSync(distDir, { recursive: true }); + const dirs = fs.readdirSync(workDir); + for (const dir of dirs) { + if (dir.startsWith('build_')) { + const contents = path.resolve(dir, 'dist'); + if (fs.existsSync(contents)) { + await execa('cp', ['-rp', contents, distDir]); + } } } - // TODO -- merge all the build/xxx/dist folders // Create an artifact const artifactsDir = path.resolve(workDir, 'artifacts');