build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed#51558
Merged
dsanders11 merged 3 commits intoMay 12, 2026
Conversation
6bb4d50 to
11938ca
Compare
11938ca to
8779a15
Compare
jkleinsc
approved these changes
May 11, 2026
|
No Release Notes |
jkleinsc
pushed a commit
that referenced
this pull request
May 14, 2026
* fix: don't return a `nullptr` from `TargetForRect` Co-authored-by: Noah Gregory <nmggithub@electronjs.org> * fix: address concerns Co-authored-by: Noah Gregory <nmggithub@electronjs.org> * chore: use promise's context for memory dump callback. (#51570) Co-authored-by: BILL SHEN <15865969+cucbin@users.noreply.github.com> * build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed (#51558) * build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed * ci: fix lint workflow detection of src/buildtools * ci: bump build-tools SHA Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * build: update squirrel.mac to 8d808803, drop upstreamed patches (#51584) Bumps squirrel.mac from 0e5d146ba1 to 8d808803bc and removes 14 patches that have been upstreamed into Squirrel/Squirrel.Mac (mainly via Squirrel/Squirrel.Mac#312, plus Squirrel/Squirrel.Mac#298, Squirrel/Squirrel.Mac#302, Squirrel/Squirrel.Mac#308). Only build_add_gn_config.patch remains, slimmed down to GN-only changes since Squirrel/Squirrel.Mac#298 upstreamed the ReactiveCocoa -> ReactiveObjC import renames it was carrying. Co-authored-by: Samuel Attard <sam@electronjs.org> * Revert "build: update squirrel.mac to 8d808803, drop upstreamed patches (#51584)" This reverts commit d4e9004. * Revert "build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed (#51558)" This reverts commit 090b568. * Revert "chore: use promise's context for memory dump callback. (#51570)" This reverts commit a74d8a1. --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Noah Gregory <nmggithub@electronjs.org> Co-authored-by: BILL SHEN <15865969+cucbin@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
Alternative to #51440. I landed an upstream change which properly finds
src/buildtoolsfor us indepot_tools, so we can drop our usage ofCHROMIUM_BUILDTOOLS_PATH. The changes in this PR will do a functional test withdepot_toolsto determine if we have that upstream fix, and fallback to settingCHROMIUM_BUILDTOOLS_PATHif we don't.This is safe to land on its own, but will not be a complete migration until electron/build-tools#859 lands and we bump thebuild-toolsSHA here.This PR also removes
get_depot_tools_envfromutil.pyas the only usage was removed in #51263.Checklist
Release Notes
Notes: none