feaf18e371
* chore: bump chromium in DEPS to 112.0.5576.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4191759: Reuse PrintBackend process from query for printing https://chromium-review.googlesource.com/c/chromium/src/+/4191759 * 4189718: Revert "[code health] Remove NotificationService use by SpellcheckService" https://chromium-review.googlesource.com/c/chromium/src/+/4189718 * 4216074: web_contents_delegate: remove content:: https://chromium-review.googlesource.com/c/chromium/src/+/4216074 * 4192284: ios: Add feature flag for PartitionAlloc. https://chromium-review.googlesource.com/c/chromium/src/+/4192284 * chore: bump chromium in DEPS to 112.0.5578.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4067682: Define ThirdPartyCookiesUserBypass runtime feature and plumb it through to URLRequest.cookie_setting_overrides. https://chromium-review.googlesource.com/c/chromium/src/+/4067682 * chore: fixup patch indices * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: fixup patch indices * chore: bump chromium in DEPS to 112.0.5579.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5581.0 * chore: update patches * refactor: use modern base values in tracing Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4210912 * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 * refactor: base value type DICTIONARY replaced with DICT Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4198081 * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 * refactor: rename latency metrics Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4048262 * refactor: add sanitized context to clipboard write Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4178264 * refactor: s/Rect/WindowFeatures Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4167001 * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 * chore: remove dead DecodeToken code * refactor: refactoring geolocation manager Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4161603 * chore: iwyu net/cert/cert_verify_result.h * build: use xcode 14 * chore: bump chromium in DEPS to 112.0.5583.0 * chore: update patches * chore: fixup mas patches * refactor: base::span explicit conversion checks Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4219636 * chore: bump chromium in DEPS to 112.0.5591.0 * chore: bump chromium in DEPS to 112.0.5593.0 * chore: bump chromium in DEPS to 112.0.5594.3 * chore: bump chromium in DEPS to 112.0.5597.0 * chore: update chromium patches * 4242507: Move most of GetChromeKeySystems() into components/cdm Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4242507 It seems as though the bug this patch was trying to resolve is now fixed. * chore: update v8 patches * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4247938: Bump min required GTK version to 3.20 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4247938 * 4173660: Remove unused argument in BeforeUnloadCompleted Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4173660 * 4226656: Add response url to SimpleURLLoader::OnRedirectCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4226656 * fixup!: 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManager Host. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * chore: bump chromium in DEPS to 112.0.5599.0 * chore: update patches * 4251237: [StorageKey Cleanup] (2) Rename CreateFirstParty constructors Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4251237 * 4256866: [Extensions] Replace GetHooksForAPI with a RegisterHooksDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4256866 * chore: bump chromium in DEPS to 112.0.5601.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5603.0 * chore: bump chromium in DEPS to 112.0.5605.0 * chore: bump chromium in DEPS to 112.0.5607.0 * update patches * fix mas patch * chore: bump chromium in DEPS to 112.0.5609.0 * chore: update patches * build: update appveyor image 4072083: New toolchain for Windows 11 10.0.22621.755 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/4072083 * chore: bump chromium in DEPS to 112.0.5611.0 * fix patches * chore: update patches * 4261434: Remove browser_watcher (1/3): Move ExitCodeWatcher to chrome/app https://chromium-review.googlesource.com/c/chromium/src/+/4261434 * 4258446: Move network::mojom::ClearDataFilter to its own mojom file https://chromium-review.googlesource.com/c/chromium/src/+/4258446 * 4128591: Enable large pdbs by default https://chromium-review.googlesource.com/c/chromium/src/+/4128591 * move dbgcore/dbghelp to extensions_to_skip * chore: bump chromium in DEPS to 113.0.5624.0 * chore: bump chromium in DEPS to 113.0.5626.0 * chore: bump chromium in DEPS to 113.0.5628.2 * chore: bump chromium in DEPS to 113.0.5630.0 * chore: bump chromium in DEPS to 113.0.5632.0 * chore: bump chromium in DEPS to 113.0.5634.0 * chore: bump chromium in DEPS to 113.0.5636.0 * 4255184: Permit popups from fullscreen-within-tab openers https://chromium-review.googlesource.com/c/chromium/src/+/4255184 * 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth https://chromium-review.googlesource.com/c/chromium/src/+/4297715 * 4301154: Remove GLContextCGL and cleanup relevant code https://chromium-review.googlesource.com/c/chromium/src/+/4301154 * 4278389: CDP: fix Page.addScriptToEvaluateOnNewDocument in iframes https://chromium-review.googlesource.com/c/chromium/src/+/4278389 * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4291989: Refactor logic determining untrusted mojo invitation flag. https://chromium-review.googlesource.com/c/chromium/src/+/4291989 * 4110189: Add Select option to content touch selection menu. https://chromium-review.googlesource.com/c/chromium/src/+/4110189 * 4309923: [Extensions] Add a unit test for API permissions having features https://chromium-review.googlesource.com/c/chromium/src/+/4309923 * 4282657: Revert "[headless] Route stdio to parent console on Windows." https://chromium-review.googlesource.com/c/chromium/src/+/4282657 * 4306685: [v8] Improve V8 flag configuration to avoid errors https://chromium-review.googlesource.com/c/chromium/src/+/4306685 * 4295455: Add fallback Linux UI for when GTK 3.20 isn't available https://chromium-review.googlesource.com/c/chromium/src/+/4295455 * 4289774: Remove feature for shared sandbox policies https://chromium-review.googlesource.com/c/chromium/src/+/4289774 * 4292705: Rename WebSwapCGLLayer to ANGLESwapCGLLayer outside WebKit. https://chromium-review.googlesource.com/c/angle/angle/+/4292705 * chore: fixup patch indices * fixup! 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth * 4289789: Remove base::JSONReader::ReadDeprecated https://chromium-review.googlesource.com/c/chromium/src/+/4289789 * 4281521: Remove `base::Value::FindKey()` https://chromium-review.googlesource.com/c/chromium/src/+/4281521 * 4276761: Update NAK constructor and GetIsCrossSite https://chromium-review.googlesource.com/c/chromium/src/+/4276761 * 4288119: Let GetUpload work with UploadInfo pointers https://chromium-review.googlesource.com/c/chromium/src/+/4288119 * 4285322: content: Move WebExposedIsolationLevel to its own public header https://chromium-review.googlesource.com/c/chromium/src/+/4285322 * 4251818: [Extensions] Make ExtensionSet moveable. https://chromium-review.googlesource.com/c/chromium/src/+/4251818 * 4299554: [json-schema-compiler] Refactor to Params::Create (14/74) https://chromium-review.googlesource.com/c/chromium/src/+/4299554 * chore: update printing patch indices * chore: update chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4295455 Our patch changes the signature of `LinuxUiTheme::GetWindowFrameProvider()`. Upstream 4295455 added a new subclass (FallbackLinuxUi) so sync its version of GetWindowFrameProvider() to match our changes. * chore: disable node test parallel/test-intl Disabling the test because upstream is still working on this feature. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4237675 Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1414292 When upstream churn is done we should re-enable this test and update it as necessary. * win7dep: Remove ResolveCoreWinRTStringDelayload Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4277708 Upstream has removed this since Win7 support is deprecated. This updates our `language_util_win.cc` file using the same approach that 4277708 uses for `base/win/win_util.cc`. * fix: remove use of ResolveCoreWinRTDelayload() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297979 A followup to prev commit, which removed ResolveCoreWinRTStringDelayload(). This PR follows the 4297979 approach of simply removing the calls, e.g. https://chromium-review.googlesource.com/c/chromium/src/+/4297979/4/chrome/browser/device_reauth/win/authenticator_win.cc * fix: add d3dcompiler_47 to the zip manifest Xref: https://chromium-review.googlesource.com/c/angle/angle/+/4285717 Xref (24-x-y):0fb1def32b
* This clang roll breaks Linux arm 32-bit Xref (24-x-y):1229114494
Xref (chromium): https://crbug.com/1410101 * fix: WebUSB on ARM64 macs (#37441) * chore: update patches * chore: fix macOS CI build. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4278307 That whole dir was previously being removed to save space since we don't use it. We still don't use anything in the file, but gn needs it to exist. * fixup! chore: fix macOS CI build. chore: mkdir --parents does not exist on BSD; use mkdir -p * chore: update chromium/mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4273450 Upstream added a new block of code using NSAccessibilityRemoteUIElement, so stub it out with `#if !IS_MAS_BUILD()` same as we do everwhere else. * chore: address code review nit :) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
219 lines
7 KiB
JavaScript
219 lines
7 KiB
JavaScript
if (!process.env.CI) require('dotenv-safe').load();
|
|
|
|
const assert = require('assert');
|
|
const fs = require('fs');
|
|
const got = require('got');
|
|
const path = require('path');
|
|
const { handleGitCall, ELECTRON_DIR } = require('./lib/utils.js');
|
|
const { Octokit } = require('@octokit/rest');
|
|
const octokit = new Octokit();
|
|
|
|
const APPVEYOR_IMAGES_URL = 'https://ci.appveyor.com/api/build-clouds';
|
|
const APPVEYOR_JOB_URL = 'https://ci.appveyor.com/api/builds';
|
|
const ROLLER_BRANCH_PATTERN = /^roller\/chromium$/;
|
|
|
|
const DEFAULT_BUILD_CLOUD_ID = '1598';
|
|
const DEFAULT_BUILD_CLOUD = 'electronhq-16-core';
|
|
const DEFAULT_BAKE_BASE_IMAGE = 'e-112.0.5607.0-vs2022';
|
|
const DEFAULT_BUILD_IMAGE = 'e-112.0.5607.0-vs2022';
|
|
|
|
const appveyorBakeJob = 'electron-bake-image';
|
|
const appVeyorJobs = {
|
|
'electron-x64': 'electron-x64-testing',
|
|
'electron-woa': 'electron-woa-testing',
|
|
'electron-ia32': 'electron-ia32-testing'
|
|
};
|
|
|
|
async function makeRequest ({ auth, username, password, url, headers, body, method }) {
|
|
const clonedHeaders = {
|
|
...(headers || {})
|
|
};
|
|
if (auth?.bearer) {
|
|
clonedHeaders.Authorization = `Bearer ${auth.bearer}`;
|
|
}
|
|
|
|
const options = {
|
|
headers: clonedHeaders,
|
|
body,
|
|
method
|
|
};
|
|
|
|
if (username || password) {
|
|
options.username = username;
|
|
options.password = password;
|
|
}
|
|
|
|
const response = await got(url, options);
|
|
|
|
if (response.statusCode < 200 || response.statusCode >= 300) {
|
|
console.error('Error: ', `(status ${response.statusCode})`, response.body);
|
|
throw new Error(`Unexpected status code ${response.statusCode} from ${url}`);
|
|
}
|
|
return JSON.parse(response.body);
|
|
}
|
|
|
|
async function checkAppVeyorImage (options) {
|
|
const IMAGE_URL = `${APPVEYOR_IMAGES_URL}/${options.cloudId}`;
|
|
const requestOpts = {
|
|
url: IMAGE_URL,
|
|
auth: {
|
|
bearer: process.env.APPVEYOR_TOKEN
|
|
},
|
|
headers: {
|
|
'Content-Type': 'application/json'
|
|
},
|
|
method: 'GET'
|
|
};
|
|
|
|
try {
|
|
const { settings } = await makeRequest(requestOpts);
|
|
const { cloudSettings } = settings;
|
|
return cloudSettings.images.find(image => image.name === `${options.imageVersion}`) || null;
|
|
} catch (err) {
|
|
console.log('Could not call AppVeyor: ', err);
|
|
}
|
|
}
|
|
|
|
async function getPullRequestId (targetBranch) {
|
|
const prsForBranch = await octokit.pulls.list({
|
|
owner: 'electron',
|
|
repo: 'electron',
|
|
state: 'open',
|
|
head: `electron:${targetBranch}`
|
|
});
|
|
if (prsForBranch.data.length === 1) {
|
|
return prsForBranch.data[0].number;
|
|
} else {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function useAppVeyorImage (targetBranch, options) {
|
|
const validJobs = Object.keys(appVeyorJobs);
|
|
if (options.job) {
|
|
assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}. Valid values are: ${validJobs}.`);
|
|
callAppVeyorBuildJobs(targetBranch, options.job, options);
|
|
} else {
|
|
validJobs.forEach((job) => callAppVeyorBuildJobs(targetBranch, job, options));
|
|
}
|
|
}
|
|
|
|
async function callAppVeyorBuildJobs (targetBranch, job, options) {
|
|
console.log(`Using AppVeyor image ${options.version} for ${job}`);
|
|
|
|
const pullRequestId = await getPullRequestId(targetBranch);
|
|
const environmentVariables = {
|
|
APPVEYOR_BUILD_WORKER_CLOUD: DEFAULT_BUILD_CLOUD,
|
|
APPVEYOR_BUILD_WORKER_IMAGE: options.version,
|
|
ELECTRON_OUT_DIR: 'Default',
|
|
ELECTRON_ENABLE_STACK_DUMPING: 1,
|
|
ELECTRON_ALSO_LOG_TO_STDERR: 1,
|
|
GOMA_FALLBACK_ON_AUTH_FAILURE: true,
|
|
DEPOT_TOOLS_WIN_TOOLCHAIN: 0,
|
|
PYTHONIOENCODING: 'UTF-8'
|
|
};
|
|
|
|
const requestOpts = {
|
|
url: APPVEYOR_JOB_URL,
|
|
auth: {
|
|
bearer: process.env.APPVEYOR_TOKEN
|
|
},
|
|
headers: {
|
|
'Content-Type': 'application/json'
|
|
},
|
|
body: JSON.stringify({
|
|
accountName: 'electron-bot',
|
|
projectSlug: appVeyorJobs[job],
|
|
branch: targetBranch,
|
|
pullRequestId: pullRequestId || undefined,
|
|
commitId: options.commit || undefined,
|
|
environmentVariables
|
|
}),
|
|
method: 'POST'
|
|
};
|
|
|
|
try {
|
|
const { version } = await makeRequest(requestOpts);
|
|
const buildUrl = `https://ci.appveyor.com/project/electron-bot/${appVeyorJobs[job]}/build/${version}`;
|
|
console.log(`AppVeyor CI request for ${job} successful. Check status at ${buildUrl}`);
|
|
} catch (err) {
|
|
console.log('Could not call AppVeyor: ', err);
|
|
}
|
|
}
|
|
|
|
async function bakeAppVeyorImage (targetBranch, options) {
|
|
console.log(`Baking a new AppVeyor image for ${options.version}, on build cloud ${options.cloudId}`);
|
|
|
|
const environmentVariables = {
|
|
APPVEYOR_BUILD_WORKER_CLOUD: DEFAULT_BUILD_CLOUD,
|
|
APPVEYOR_BUILD_WORKER_IMAGE: DEFAULT_BAKE_BASE_IMAGE,
|
|
APPVEYOR_BAKE_IMAGE: options.version
|
|
};
|
|
|
|
const requestOpts = {
|
|
url: APPVEYOR_JOB_URL,
|
|
auth: {
|
|
bearer: process.env.APPVEYOR_TOKEN
|
|
},
|
|
headers: {
|
|
'Content-Type': 'application/json'
|
|
},
|
|
body: JSON.stringify({
|
|
accountName: 'electron-bot',
|
|
projectSlug: appveyorBakeJob,
|
|
branch: targetBranch,
|
|
commitId: options.commit || undefined,
|
|
environmentVariables
|
|
}),
|
|
method: 'POST'
|
|
};
|
|
|
|
try {
|
|
const { version } = await makeRequest(requestOpts);
|
|
const bakeUrl = `https://ci.appveyor.com/project/electron-bot/${appveyorBakeJob}/build/${version}`;
|
|
console.log(`AppVeyor image bake request for ${options.version} successful. Check bake status at ${bakeUrl}`);
|
|
} catch (err) {
|
|
console.log('Could not call AppVeyor: ', err);
|
|
}
|
|
}
|
|
|
|
async function prepareAppVeyorImage (opts) {
|
|
const branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], ELECTRON_DIR);
|
|
if (ROLLER_BRANCH_PATTERN.test(branch)) {
|
|
useAppVeyorImage(branch, { ...opts, version: DEFAULT_BUILD_IMAGE, cloudId: DEFAULT_BUILD_CLOUD_ID });
|
|
} else {
|
|
// eslint-disable-next-line no-control-regex
|
|
const versionRegex = new RegExp('chromium_version\':\n +\'(.+?)\',', 'm');
|
|
const deps = fs.readFileSync(path.resolve(__dirname, '..', 'DEPS'), 'utf8');
|
|
const [, CHROMIUM_VERSION] = versionRegex.exec(deps);
|
|
|
|
const cloudId = opts.cloudId || DEFAULT_BUILD_CLOUD_ID;
|
|
const imageVersion = opts.imageVersion || `e-${CHROMIUM_VERSION}`;
|
|
const image = await checkAppVeyorImage({ cloudId, imageVersion });
|
|
|
|
if (image && image.name) {
|
|
console.log(`Image exists for ${image.name}. Continuing AppVeyor jobs using ${cloudId}.\n`);
|
|
} else {
|
|
console.log(`No AppVeyor image found for ${imageVersion} in ${cloudId}.
|
|
Creating new image for ${imageVersion}, using Chromium ${CHROMIUM_VERSION} - job will run after image is baked.`);
|
|
await bakeAppVeyorImage(branch, { ...opts, version: imageVersion, cloudId });
|
|
|
|
// write image to temp file if running on CI
|
|
if (process.env.CI) fs.writeFileSync('./image_version.txt', imageVersion);
|
|
}
|
|
}
|
|
}
|
|
|
|
module.exports = prepareAppVeyorImage;
|
|
|
|
// Load or bake AppVeyor images for Windows CI.
|
|
// Usage: prepare-appveyor.js [--cloudId=CLOUD_ID] [--appveyorJobId=xxx] [--imageVersion=xxx]
|
|
// [--commit=sha] [--branch=branch_name]
|
|
if (require.main === module) {
|
|
const args = require('minimist')(process.argv.slice(2));
|
|
prepareAppVeyorImage(args)
|
|
.catch((err) => {
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|
|
}
|