maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[dev/build] avoid building packages twice (#24696)

Browse source
This commit is contained in:
Spencer 2018-10-31 14:51:21 -07:00 committed by GitHub
parent 84e77de924
commit 9cf22cbc99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/kbn-pm/dist/index.js vendored
View file

@ -48389,7 +48389,7 @@ Object.defineProperty(exports, "__esModule", {
exports.buildProductionProjects = undefined;
let buildProductionProjects = exports.buildProductionProjects = (() => {
var _ref = _asyncToGenerator(function* ({ kibanaRoot, buildRoot }) {
var _ref = _asyncToGenerator(function* ({ kibanaRoot, buildRoots }) {
const projects = yield getProductionProjects(kibanaRoot);
const projectGraph = (0, _projects.buildProjectGraph)(projects);
const batchedProjects = (0, _projects.topologicallyBatchProjects)(projects, projectGraph);
@ -48401,7 +48401,9 @@ let buildProductionProjects = exports.buildProductionProjects = (() => {
for (const project of batch) {
yield deleteTarget(project);
yield buildProject(project);
yield copyToBuild(project, kibanaRoot, buildRoot);
for (const buildRoot of buildRoots) {
yield copyToBuild(project, kibanaRoot, buildRoot);
}
}
}
});

8
packages/kbn-pm/src/production/build_production_projects.ts
View file

@ -39,10 +39,10 @@ import {
export async function buildProductionProjects({
kibanaRoot,
buildRoot,
buildRoots,
}: {
kibanaRoot: string;
buildRoot: string;
buildRoots: string[];
}) {
const projects = await getProductionProjects(kibanaRoot);
const projectGraph = buildProjectGraph(projects);
@ -55,7 +55,9 @@ export async function buildProductionProjects({
for (const project of batch) {
await deleteTarget(project);
await buildProject(project);
await copyToBuild(project, kibanaRoot, buildRoot);
for (const buildRoot of buildRoots) {
await copyToBuild(project, kibanaRoot, buildRoot);
}
}
}
}

2
packages/kbn-pm/src/production/integration_tests/build_production_projects.test.ts
View file

@ -51,7 +51,7 @@ describe('kbn-pm production', () => {
});
}
await buildProductionProjects({ kibanaRoot: tmpDir, buildRoot });
await buildProductionProjects({ kibanaRoot: tmpDir, buildRoots: [buildRoot] });
const files = await globby(['**/*', '!**/node_modules/**'], {
cwd: buildRoot,

8
src/dev/build/lib/__tests__/runner.js
View file

@ -69,7 +69,7 @@ describe('dev/build/lib/runner', () => {
const runTask = sinon.stub();
await run({ global: true, run: runTask });
sinon.assert.calledOnce(runTask);
sinon.assert.calledWithExactly(runTask, config, log);
sinon.assert.calledWithExactly(runTask, config, log, sinon.match.array);
});
it('does not call local tasks', async () => {
@ -91,7 +91,7 @@ describe('dev/build/lib/runner', () => {
const runTask = sinon.stub();
await run({ global: true, run: runTask });
sinon.assert.calledOnce(runTask);
sinon.assert.calledWithExactly(runTask, config, log);
sinon.assert.calledWithExactly(runTask, config, log, sinon.match.array);
});
it('runs local tasks twice, passing config log and both builds', async () => {
@ -114,7 +114,7 @@ describe('dev/build/lib/runner', () => {
const runTask = sinon.stub();
await run({ global: true, run: runTask });
sinon.assert.calledOnce(runTask);
sinon.assert.calledWithExactly(runTask, config, log);
sinon.assert.calledWithExactly(runTask, config, log, sinon.match.array);
});
it('runs local tasks once, passing config log and default build', async () => {
@ -136,7 +136,7 @@ describe('dev/build/lib/runner', () => {
const runTask = sinon.stub();
await run({ global: true, run: runTask });
sinon.assert.calledOnce(runTask);
sinon.assert.calledWithExactly(runTask, config, log);
sinon.assert.calledWithExactly(runTask, config, log, sinon.match.array);
});
it('runs local tasks once, passing config log and oss build', async () => {

2
src/dev/build/lib/runner.js
View file

@ -82,7 +82,7 @@ export function createRunner({ config, log, buildOssDist, buildDefaultDist }) {
*/
return async function run(task) {
if (task.global) {
await execTask(chalk`{dim [ global ]} ${task.description}`, task.run);
await execTask(chalk`{dim [ global ]} ${task.description}`, task.run, builds);
} else {
for (const build of builds) {
await execTask(`${build.getLogTag()} ${task.description}`, task.run, build);

6
src/dev/build/tasks/build_packages_task.js
View file

@ -67,12 +67,12 @@ import { buildProductionProjects } from '@kbn/pm';
*/
export const BuildPackagesTask = {
global: true,
description: 'Building distributable versions of packages',
async run(config, log, build) {
async run(config, log, builds) {
await buildProductionProjects({
kibanaRoot: config.resolveFromRepo(),
buildRoot: build.resolvePath(),
oss: build.isOss(),
buildRoots: builds.map(build => build.resolvePath()),
});
},
};