Skip to content

Commit

Permalink
revert back to JS for install_chromium to avoid pulling x-pack into src
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Jul 21, 2020
1 parent ecaa965 commit 3be8ffc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/dev/build/tasks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export * from './create_archives_task';
export * from './create_empty_dirs_and_files_task';
export * from './create_package_json_task';
export * from './create_readme_task';
export * from './install_chromium';
export * from './install_dependencies_task';
export * from './license_file_task';
export * from './nodejs';
Expand All @@ -41,3 +40,6 @@ export * from './transpile_scss_task';
export * from './uuid_verification_task';
export * from './verify_env_task';
export * from './write_sha_sums_task';

// @ts-expect-error this module can't be TS because it ends up pulling x-pack into Kibana
export { InstallChromium } from './install_chromium';
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import { first } from 'rxjs/operators';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { installBrowser } from '../../../../x-pack/plugins/reporting/server/browsers/install';

import { Task } from '../lib';

export const InstallChromium: Task = {
export const InstallChromium = {
description: 'Installing Chromium',

async run(config, log, build) {
Expand All @@ -36,7 +34,7 @@ export const InstallChromium: Task = {

const { binaryPath$ } = installBrowser(
// TODO: https://github.com/elastic/kibana/issues/72496
log as any,
log,
build.resolvePathForPlatform(platform, 'x-pack/plugins/reporting/chromium'),
platform.getName(),
platform.getArchitecture()
Expand Down

0 comments on commit 3be8ffc

Please sign in to comment.