Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.6] [Screenshotting] fix revision number used for mac and windows downloads of chromium (#155313) #155756

Closed
wants to merge 1 commit into from
Closed

[8.6] [Screenshotting] fix revision number used for mac and windows downloads of chromium (#155313) #155756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/dev/chromium_version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ async function getChromiumRevision(
kibanaPuppeteerVersion: PuppeteerRelease,
log: ToolingLog
): Promise<ChromiumRevision> {
const url = `https://raw.githubusercontent.com/puppeteer/puppeteer/v${kibanaPuppeteerVersion}/src/revisions.ts`;
const url = `https://raw.githubusercontent.com/puppeteer/puppeteer/v${kibanaPuppeteerVersion}/packages/puppeteer-core/src/revisions.ts`;
let body: string;
try {
log.info(`Fetching code from Puppeteer source: ${url}`);
Expand Down Expand Up @@ -103,7 +103,12 @@ async function getChromiumCommit(
throw new Error(`Could not find a Chromium commit! Check ${url} in a browser.`);
}

const baseUrl = 'https://commondatastorage.googleapis.com/chromium-browser-snapshots';

log.info(`Found Chromium commit ${commit} from revision ${revision}.`);
log.info(`Mac x64 download: ${baseUrl}/Mac/${revision}/chrome-mac.zip`);
log.info(`Mac ARM download: ${baseUrl}/Mac_Arm/${revision}/chrome-mac.zip`);
log.info(`Windows x64 download: ${baseUrl}/Win/${revision}/chrome-win.zip`);
return commit;
}

Expand Down
14 changes: 7 additions & 7 deletions x-pack/plugins/screenshotting/server/browsers/chromium/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface PackageInfo {
location: 'custom' | 'common';
}

const REVISION = 1036745;
const REVISION = 1045629;

enum BaseUrl {
// see https://www.chromium.org/getting-involved/download-chromium
Expand All @@ -45,8 +45,8 @@ export class ChromiumArchivePaths {
platform: 'darwin',
architecture: 'x64',
archiveFilename: 'chrome-mac.zip',
archiveChecksum: 'dd4d44ad97ba2fef5dc47d7f2a39ccaa',
binaryChecksum: '4a7a663b2656d66ce975b00a30df3ab4',
archiveChecksum: '028606a28586800b70d249d050a360d5',
binaryChecksum: 'db876895b31ed6923cb1e99fea12062e',
binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
location: 'common',
archivePath: 'Mac',
Expand All @@ -56,8 +56,8 @@ export class ChromiumArchivePaths {
platform: 'darwin',
architecture: 'arm64',
archiveFilename: 'chrome-mac.zip',
archiveChecksum: '5afc0d49865d55b69ea1ff65b9cc5794',
binaryChecksum: '4a7a663b2656d66ce975b00a30df3ab4',
archiveChecksum: '727029f573d3b85be596b80b810b0237',
binaryChecksum: '8668272094c610c15bad15b068f8f73c',
binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
location: 'common',
archivePath: 'Mac_Arm',
Expand Down Expand Up @@ -87,8 +87,8 @@ export class ChromiumArchivePaths {
platform: 'win32',
architecture: 'x64',
archiveFilename: 'chrome-win.zip',
archiveChecksum: '42db052673414b89d8cb45657c1a6aeb',
binaryChecksum: '1b6eef775198ffd48fb9669ac0c818f7',
archiveChecksum: '2e24beb0e1d7201bad98b8c231c63d97',
binaryChecksum: '47b1e6d9179fb8cadeef9c8939dce12d',
binaryRelativePath: path.join('chrome-win', 'chrome.exe'),
location: 'common',
archivePath: 'Win',
Expand Down