鱼皮AI导航
鱼皮AI导航
  • 主页
  • 社区
  • AI工具
  • AI知识库
  • AI提示词
  • MCP
  • Skills
  • AI学习资源
  • AI资讯
  • GitHub开源
登录/注册

electron-chromium-upgrade

指导 Electron项目中 Chromium 版本升级的全流程,涵盖同步依赖时的补丁冲突解决与构建阶段的编译问题修复。通过反复执行同步与构建命令,定位并修复补丁应用及代码兼容性问题,确保所有更改按规范提交,最终实现 Electron 成功构建并启动。

开发运维
访问 GitHub
文档Skills.MD
name
electron-chromium-upgrade
description
Guide for performing Chromium version upgrades in the Electron project. Use when working on the roller/chromium/main branch to fix patch conflicts during `e sync --3`. Covers the patch application workflow, conflict resolution, analyzing upstream Chromium changes, and proper commit formatting for patch fixes.

Electron Chromium Upgrade: Phase One

Summary

Run e sync --3 repeatedly, fixing patch conflicts as they arise, until it succeeds. Then run e patches all and commit changes atomically.

Success Criteria

Phase One is complete when:

  • e sync --3 exits with code 0 (no patch failures)
  • e patches all has been run to export all changes
  • All changes are committed per the commit guidelines below

Do not stop until these criteria are met.

CRITICAL Do not delete or skip patches unless 100% certain the patch is no longer needed. Complicated conflicts or hard to resolve issues should be presented to the user after you have exhausted all other options. Do not delete the patch just because you can't solve it.

Context

The roller/chromium/main branch is created by automation to update Electron's Chromium dependency SHA. No work has been done to handle breaking changes between the old and new versions.

Key directories:

  • Current directory: Electron repo (always run e commands here)
  • .. (parent): Chromium repo (where most patches apply)
  • patches/: Patch files organized by target
  • docs/development/patches.md: Patch system documentation

Workflow

  1. Delete the .git/rr-cache in both the electron and .. folder to ensure no accidental rerere replays occur from before this upgrade phase attempt started
  2. Run e sync --3 (the --3 flag enables 3-way merge, always required)
  3. If succeeds → skip to step 6
  4. If patch fails:
    • Identify target repo and patch from error output
    • Analyze failure (see references/patch-analysis.md)
    • Fix conflict in target repo's working directory
    • Run git am --continue in affected repo
    • Repeat until all patches for that repo apply
    • IMPORTANT: Once git am --continue succeeds you MUST run e patches {target} to export fixes
    • Return to step 1
  5. When e sync --3 succeeds, run e patches all
  6. Read references/phase-one-commit-guidelines.md NOW, then commit changes following those instructions exactly.

Before committing any Phase One changes, you MUST read references/phase-one-commit-guidelines.md and follow its instructions exactly.

Commands Reference

CommandPurpose
e sync --3Clone deps and apply patches with 3-way merge
git am --continueContinue after resolving conflict (run in target repo)
e patches {target}Export commits from target repo to patch files
e patches allExport all patches from all targets
e patches --list-targetsList targets and config paths

Patch System Mental Model

▼
text
复制代码
patches/{target}/*.patch → [e sync --3] → target repo commits ← [e patches] ←

When to Edit Patches

SituationAction
During active git am conflictFix in target repo, then git am --continue
Modifying patch outside conflictEdit .patch file directly
Creating new patch (rare, avoid)Commit in target repo, then e patches {target}

Fix existing patches 99% of the time rather than creating new ones.

Patch Fixing Rules

  1. Preserve authorship: Keep original author in TODO comments (from patch From: field)
  2. Never change TODO assignees: TODO(name) must retain original name
  3. Update descriptions: If upstream changed (e.g., DCHECK → CHECK_IS_TEST), update patch commit message to reflect current state

Final Deliverable

After Phase One, write a summary of every change: what was fixed, why, reasoning, and Chromium CL links.

Electron Chromium Upgrade: Phase Two

Summary

Run e build -k 999 repeatedly, fixing build issues as they arise, until it succeeds. Then run e start --version to validate Electron launches and commit changes atomically.

Run Phase Two immediately after Phase One is complete.

Success Criteria

Phase Two is complete when:

  • e build -k 999 exits with code 0 (no build failures)
  • e start --version has been run to check Electron launches
  • All changes are committed per the commit guidelines below

Do not stop until these criteria are met. Do not delete code or features, never comment out code in order to take short cut. Make all existing code, logic and intention work.

Context

The roller/chromium/main branch is created by automation to update Electron's Chromium dependency SHA. No work has been done to handle breaking changes between the old and new versions. Chromium APIs frequently are renamed or refactored. In every case the code in Electron must be updated to account for the change in Chromium, strongly avoid making changes to the code in chromium to fix Electrons build.

Key directories:

  • Current directory: Electron repo (always run e commands here)
  • .. (parent): Chromium repo (do not touch this code to fix build issues, just read it to obtain context)

Workflow

  1. Run e build -k 999 (the -k 999 flag is a flag to ninja to say "do not stop until you find that many errors" it is an attempt to get as much error context as possible for each time we run build)
  2. If succeeds → skip to step 6
  3. If build fails:
    • Identify underlying file in "electron" from the compilation error message
    • Analyze failure
    • Fix build issue by adapting Electron's code for the change in Chromium
    • Run e build -t {target_that_failed}.o to build just the failed target we were specifically fixing
      • You can identify the target_that_failed from the failure line in the build log. E.g. FAILED: 2e506007-8d5d-4f38-bdd1-b5cd77999a77 "./obj/electron/chromium_src/chrome/process_singleton_posix.o" CXX obj/electron/chromium_src/chrome/process_singleton_posix.o the target name is obj/electron/chromium_src/chrome/process_singleton_posix.o
    • Read references/phase-two-commit-guidelines.md NOW, then commit changes following those instructions exactly.
    • Return to step 1
  4. CRITICAL: After ANY commit (especially patch commits), immediately run git status in the electron repo
    • Look for other modified .patch files that only have index/hunk header changes
    • These are dependent patches affected by your fix
    • Commit them immediately with: git commit -am "chore: update patch hunk headers"
    • This prevents losing track of necessary updates
  5. Return to step 1
  6. When e build succeeds, run e start --version
  7. Check if you have any pending changes in the Chromium repo by running git status
    • If you have changes follow the instructions below in "A. Patch Fixes" to correctly commit those modifications into the appropriate patch file

Before committing any Phase Two changes, you MUST read references/phase-two-commit-guidelines.md and follow its instructions exactly.

Build Error Detection

When monitoring e build -k 999 output, filter for errors using this regex pattern: error:|FAILED:|fatal:|subcommand failed|build finished

The build output is extremely verbose. Filtering is essential to catch errors quickly.

Commands Reference

CommandPurpose
e build -k 999Builds Electron and won't stop until either all targets attempted or 999 errors found
e build -t {target}.oBuild just one specific target to verify a fix
e start --versionValidate Electron launches after successful build

Two Types of Build Fixes

A. Patch Fixes (for files in chromium_src or patched Chromium files)

When the error is in a file that Electron patches (check with grep -l "filename" patches/chromium/*.patch):

  1. Edit the file in the Chromium source tree (e.g., /src/chrome/browser/...)
  2. Create a fixup commit targeting the original patch commit:
    ▼
    bash
    复制代码
    cd .. # to chromium repo git add <modified-file> git commit --fixup=<original-patch-commit-hash> GIT_SEQUENCE_EDITOR=: git rebase --autosquash --autostash -i <commit>^
  3. Export the updated patch: e patches chromium
  4. Commit the updated patch file in the electron repo following the references/phase-one-commit-guidelines.md, then commit changes following those instructions exactly. READ THESE GUIDELINES BEFORE COMMITTING THESE CHANGES

To find the original patch commit to fixup: git log --oneline | grep -i "keyword from patch name"

The base commit for rebase is the Chromium commit before patches were applied. Find it by checking the refs/patches/upstream-head ref.

B. Electron Code Fixes (for files in shell/, electron/, etc.)

When the error is in Electron's own source code:

  1. Edit files directly in the electron repo
  2. Commit directly (no patch export needed)

Dependent Patch Updates

IMPORTANT: When you modify a patch, other patches that apply to the same file may have their hunk headers invalidated. After committing a patch fix:

  1. Run git status in the electron repo
  2. Look for other modified .patch files with just index/hunk header changes
  3. Commit these with: git commit -m "chore: update patch hunk headers"

Critical: Read Before Committing

  • Before ANY Phase One commits: Read references/phase-one-commit-guidelines.md
  • Before ANY Phase Two commits: Read references/phase-two-commit-guidelines.md

Skill Directory Structure

This skill has additional reference files in references/:

  • patch-analysis.md - How to analyze patch failures
  • phase-one-commit-guidelines.md - Commit format for Phase One
  • phase-two-commit-guidelines.md - Commit format for Phase Two

Read these when referenced in the workflow steps.

开发运维

快捷安装

复制到终端去安装 Skill

npxskillsaddelectron/electron--skill"electron-chromium-upgrade"
站长:程序员鱼皮 老鱼简历 商务合作 增值电信业务经营许可证
2026 鱼皮AI导航 | 沪ICP备19026706号-6
站长:程序员鱼皮 老鱼简历 商务合作 增值电信业务经营许可证
2026 鱼皮AI导航 | 沪ICP备19026706号-6
🔥热门工具
朱雀AI检测朱雀AI检测
朱雀AI检测助手朱雀AI检测助手
LovartLovart
老鱼简历老鱼简历
WritePass官网WritePass官网
面多多面多多
CursorCursor
星月写作星月写作
朱雀AI检测助手朱雀AI检测助手
零感AI零感AI
Skills 推荐
retrieving-developer-knowledge
retrieving-developer-knowledge 用于搜索、获取和整合 Google 官方开发者文档,覆盖 Google Cloud、AI/Gemini、Android、Chrome、Web、Flutter、Go、Firebase 等平台,适用于查询 gcloud CLI 命令、API 语法、IAM 权限或架构对比等场景。
diff-intake
diff-intake 读取 PR 或分支差异,生成结构化 YAML 变更摘要,用于下游 analytics instrumentation 技能。适用于用户提交 PR 链接、分支对比或原始 diff 后需理解变更内容、评估分析覆盖或启动埋点流程的场景。
load-balancer-configurator
根据用户需求自动生成各类负载均衡器的生产级配置,覆盖 ALB、NLB、Nginx 和 HAProxy 等主流类型,适配不同协议、端口、健康检查及后端服务拓扑,支持直接集成到基础设施即代码流程中。
implement
实现 Linus Dashboard 的功能开发与集成,基于 TypeScript 和 Python 构建前后端组件,遵循严格的代码规范与架构模式,完成视图、卡片、服务及传感器等模块的创建与验证,确保高质量交付并兼容 Home Assistant 生态。
cloud-scheduler-job-creator
自动处理 Google Cloud Platform 中的云调度任务创建,提供符合最佳实践的配置方案与生产级代码生成,支持计算、存储、大数据及机器学习服务的集成部署。