mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: upgrade to chromium 89.0.4336.0 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * update patches * update patches * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: update patches * chore: update patches * clear out cache * Revert "clear out cache" This reverts commit 6e811fae4b7f4eeb736225ce2460857922763b66. * Update to 89.0.4342.2 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 (cherry picked from commit 102a2a3b8d57b6cddb85e9d24e44de77730c81c3) * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true (cherry picked from commit 7a2510a9f68339a252a25df3839e9e215a476d4b) * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 (cherry picked from commit b67d89155d87c86aa295cda645fdee591dacd512) * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 (cherry picked from commit 8cd4ee013eec12205832d0f763ab4480cdb10c28) * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 (cherry picked from commit 56a4a87dec21c1332e508adae4638bf00371dc73) * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 (cherry picked from commit 338d4304bc9c0abcd24306aa4901558b9db9368b) * Actually apply nan patch (cherry picked from commit bf20236386f83229ec09c434d21aca4712d0d53b) * update patches * update to 89.0.4348.1 see if this resolves Windows crashes * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum (cherry picked from commit 36accef04a9047da4f31f214f133866e48f7942c) * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 (cherry picked from commit cab78df863acfb6ca24830eac8f9df11d7d877fd) * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 (cherry picked from commit d0ba1ec443e5ea234706ee93b5b413ed6c9095d7) * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 (cherry picked from commit 1ca2fa5a3c7bd39419b50a439eb9eec4582ced28) * Remove deprecated performFileOperation usage (cherry picked from commit d2dca0c24950cbc81cec80beac9ba640e200d6fa) * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 (cherry picked from commit 944da70791253e9a564317f93814ab544c944a8e) * fixup: Add disconnect logic to ElectronBrowserHandlerImpl (cherry picked from commit e4582a10bbdd20d08d94389953cad8a4ea2b7a1d) * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 (cherry picked from commit ef1d0164bdd8b730c51d46c3099d7d4efea0133b) * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html (cherry picked from commit f4a0b5834b78d189acb03d3b43b2160dcc749a7e) * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 (cherry picked from commitcf09a792f0) * Update patches after rebase * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl (cherry picked from commitbe270753e1) * Remove unneeded BindTo (cherry picked from commitca3287895a) * Don't assign ElectronBrowserHandlerImpl at all (cherry picked from commit899ef067ed) * update patches Co-authored-by: Electron Bot <electron@github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
237 lines
11 KiB
YAML
237 lines
11 KiB
YAML
# The config expects the following environment variables to be set:
|
|
# - "GN_CONFIG" Build type. One of {'testing', 'release'}.
|
|
# - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
|
|
# e.g. 'target_cpu="x86"' to build for a 32bit platform.
|
|
# https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
|
|
# Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordningly
|
|
# if you pass a custom value for 'target_cpu'.
|
|
# - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
|
|
# - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
|
|
# Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
|
|
# - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
|
|
# Is used in some publishing scripts, but does NOT affect the Electron binary.
|
|
# Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
|
|
# - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
|
|
# Otherwise the release will be uploaded to the Github Releases.
|
|
# (The value is only checked if "ELECTRON_RELEASE" is defined.)
|
|
#
|
|
# The publishing scripts expect access tokens to be defined as env vars,
|
|
# but those are not covered here.
|
|
#
|
|
# AppVeyor docs on variables:
|
|
# https://www.appveyor.com/docs/environment-variables/
|
|
# https://www.appveyor.com/docs/build-configuration/#secure-variables
|
|
# https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
|
|
|
|
# Uncomment these lines to enable RDP
|
|
#on_finish:
|
|
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
|
|
|
version: 1.0.{build}
|
|
build_cloud: electron-16-core
|
|
image: vs2019bt-16.6.2
|
|
environment:
|
|
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
|
|
ELECTRON_OUT_DIR: Default
|
|
ELECTRON_ENABLE_STACK_DUMPING: 1
|
|
MOCHA_REPORTER: mocha-multi-reporters
|
|
MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
|
|
notifications:
|
|
- provider: Webhook
|
|
url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
|
|
method: POST
|
|
headers:
|
|
x-mission-control-secret:
|
|
secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
|
|
on_build_success: false
|
|
on_build_failure: true
|
|
on_build_status_changed: false
|
|
build_script:
|
|
- ps: >-
|
|
if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
|
|
Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
|
|
} else {
|
|
node script/yarn.js install --frozen-lockfile
|
|
|
|
$result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
|
|
Write-Output $result
|
|
if ($result.ExitCode -eq 0) {
|
|
Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
|
|
}
|
|
}
|
|
- echo "Building $env:GN_CONFIG build"
|
|
- git config --global core.longpaths true
|
|
- cd ..
|
|
- mkdir src
|
|
- update_depot_tools.bat
|
|
- ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
|
|
- ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
|
|
- ps: >-
|
|
if ($env:GN_CONFIG -eq 'release') {
|
|
$env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_requests=True"
|
|
} else {
|
|
$env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
|
|
}
|
|
- >-
|
|
gclient config
|
|
--name "src\electron"
|
|
--unmanaged
|
|
%GCLIENT_EXTRA_ARGS%
|
|
"https://github.com/electron/electron"
|
|
- ps: >-
|
|
if ($env:GN_CONFIG -eq 'release') {
|
|
$env:RUN_GCLIENT_SYNC="true"
|
|
} else {
|
|
cd src\electron
|
|
node script\generate-deps-hash.js
|
|
$depshash = Get-Content .\.depshash -Raw
|
|
$zipfile = "Z:\$depshash.7z"
|
|
cd ..\..
|
|
if (Test-Path -Path $zipfile) {
|
|
# file exists, unzip and then gclient sync
|
|
7z x -y $zipfile -mmt=30 -aoa
|
|
if (-not (Test-Path -Path "src\buildtools")) {
|
|
# the zip file must be corrupt - resync
|
|
$env:RUN_GCLIENT_SYNC="true"
|
|
if ($env:TARGET_ARCH -ne 'ia32') {
|
|
# only save on x64/woa to avoid contention saving
|
|
$env:SAVE_GCLIENT_SRC="true"
|
|
}
|
|
} else {
|
|
# update external binaries
|
|
python src/electron/script/update-external-binaries.py
|
|
# update angle
|
|
cd src\third_party\angle
|
|
git remote set-url origin https://chromium.googlesource.com/angle/angle.git
|
|
git fetch
|
|
cd ..\..\..
|
|
}
|
|
} else {
|
|
# file does not exist, gclient sync, then zip
|
|
$env:RUN_GCLIENT_SYNC="true"
|
|
if ($env:TARGET_ARCH -ne 'ia32') {
|
|
# only save on x64/woa to avoid contention saving
|
|
$env:SAVE_GCLIENT_SRC="true"
|
|
}
|
|
}
|
|
}
|
|
- if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
|
|
- ps: >-
|
|
if ($env:SAVE_GCLIENT_SRC -eq 'true') {
|
|
# archive current source for future use
|
|
# only run on x64/woa to avoid contention saving
|
|
$(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
|
|
if ($LASTEXITCODE -ne 0) {
|
|
Write-warning "Could not save source to shared drive; continuing anyway"
|
|
}
|
|
# build time generation of file gen/angle/angle_commit.h depends on
|
|
# third_party/angle/.git
|
|
# https://chromium-review.googlesource.com/c/angle/angle/+/2074924
|
|
$(7z a $zipfile src\third_party\angle\.git)
|
|
if ($LASTEXITCODE -ne 0) {
|
|
Write-warning "Failed to add third_party\angle\.git; continuing anyway"
|
|
}
|
|
}
|
|
- ps: >-
|
|
if (Test-Path 'env:RAW_GOMA_AUTH') {
|
|
$env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
|
|
$env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
|
|
}
|
|
- git clone https://github.com/electron/build-tools.git
|
|
- cd build-tools
|
|
- npm install
|
|
- mkdir third_party
|
|
- ps: >-
|
|
node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
|
|
- ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
|
|
- ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
|
|
- cd ..
|
|
- ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
|
|
- cd src
|
|
- set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn
|
|
- gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
|
|
- gn check out/Default //electron:electron_lib
|
|
- gn check out/Default //electron:electron_app
|
|
- gn check out/Default //electron/shell/common/api:mojo
|
|
- if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
|
|
- if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
|
|
- gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
|
|
- ninja -C out/ffmpeg electron:electron_ffmpeg_zip
|
|
- ninja -C out/Default electron:electron_dist_zip
|
|
- ninja -C out/Default shell_browser_ui_unittests
|
|
- gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
|
|
- ninja -C out/Default electron:electron_mksnapshot_zip
|
|
- cd out\Default
|
|
- 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
|
|
- cd ..\..
|
|
- ninja -C out/Default electron:hunspell_dictionaries_zip
|
|
- ninja -C out/Default electron:electron_chromedriver_zip
|
|
- ninja -C out/Default third_party/electron_node:headers
|
|
- python %LOCAL_GOMA_DIR%\goma_ctl.py stat
|
|
- python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
|
|
- appveyor PushArtifact out/Default/windows_toolchain_profile.json
|
|
- appveyor PushArtifact out/Default/dist.zip
|
|
- appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
|
|
- appveyor PushArtifact out/Default/chromedriver.zip
|
|
- appveyor PushArtifact out/ffmpeg/ffmpeg.zip
|
|
- 7z a node_headers.zip out\Default\gen\node_headers
|
|
- appveyor PushArtifact node_headers.zip
|
|
- appveyor PushArtifact out/Default/mksnapshot.zip
|
|
- appveyor PushArtifact out/Default/hunspell_dictionaries.zip
|
|
- appveyor PushArtifact out/Default/electron.lib
|
|
- ps: >-
|
|
if ($env:GN_CONFIG -eq 'release') {
|
|
# Needed for msdia140.dll on 64-bit windows
|
|
$env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
|
|
ninja -C out/Default electron:electron_symbols
|
|
}
|
|
- ps: >-
|
|
if ($env:GN_CONFIG -eq 'release') {
|
|
python electron\script\zip-symbols.py
|
|
appveyor-retry appveyor PushArtifact out/Default/symbols.zip
|
|
} else {
|
|
# It's useful to have pdb files when debugging testing builds that are
|
|
# built on CI.
|
|
7z a pdb.zip out\Default\*.pdb
|
|
appveyor-retry appveyor PushArtifact pdb.zip
|
|
}
|
|
- python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
|
|
test_script:
|
|
# Workaround for https://github.com/appveyor/ci/issues/2420
|
|
- set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
|
|
- ps: >-
|
|
if ((-Not (Test-Path Env:\TEST_WOA)) -And (-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
|
|
$env:RUN_TESTS="true"
|
|
}
|
|
- ps: >-
|
|
if ($env:RUN_TESTS -eq 'true') {
|
|
New-Item .\out\Default\gen\node_headers\Release -Type directory
|
|
Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
|
|
} else {
|
|
echo "Skipping tests for $env:GN_CONFIG build"
|
|
}
|
|
- cd electron
|
|
# CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
|
|
- if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
|
|
- cd ..
|
|
- if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
|
|
- echo "About to verify mksnapshot"
|
|
- if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
|
|
- echo "Done verifying mksnapshot"
|
|
- if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
|
|
- echo "Done verifying chromedriver"
|
|
deploy_script:
|
|
- cd electron
|
|
- ps: >-
|
|
if (Test-Path Env:\ELECTRON_RELEASE) {
|
|
if (Test-Path Env:\UPLOAD_TO_S3) {
|
|
Write-Output "Uploading Electron release distribution to s3"
|
|
& python script\release\uploaders\upload.py --verbose --upload_to_s3
|
|
} else {
|
|
Write-Output "Uploading Electron release distribution to github releases"
|
|
& python script\release\uploaders\upload.py --verbose
|
|
}
|
|
} elseif (Test-Path Env:\TEST_WOA) {
|
|
node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
|
|
}
|