Skip to content

build: rewrite push-patch to use the github API instead of local git commits to ensure commits are signed #47401

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.

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

Merged
merged 3 commits into from
Jun 24, 2025

Conversation

MarshallOfSound
Copy link
Member

Make tree, commit tree, push tree. 👍

Should make patch-up start working again on PRs

Notes: none

@MarshallOfSound MarshallOfSound requested a review from a team as a code owner June 6, 2025 20:01
@MarshallOfSound MarshallOfSound added target/34-x-y PR should also be added to the "34-x-y" branch. target/35-x-y PR should also be added to the "35-x-y" branch. target/36-x-y PR should also be added to the "36-x-y" branch. target/37-x-y PR should also be added to the "37-x-y" branch. labels Jun 6, 2025
Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm looks like something is amiss:
from: https://github.com/electron/electron/actions/runs/15499439929/job/43643790257?pr=47402

2025-06-06T20:53:52.7204163Z patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch: needs update
2025-06-06T20:53:53.0122621Z Error: Failed to get current branch
2025-06-06T20:53:53.0123207Z     at getCurrentBranch (/__w/electron/electron/src/electron/script/patch-up.js:51:11)
2025-06-06T20:53:53.0123784Z     at main (/__w/electron/electron/src/electron/script/patch-up.js:72:25)
2025-06-06T20:53:53.0124353Z     at process.processTicksAndRejections (node:internal/process/task_queues:105:5)

MarshallOfSound and others added 2 commits June 19, 2025 17:32
(cherry picked from commit a21afc3)
(cherry picked from commit 0edcc98)
Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dde9f9d shows patch up working properly with these changes.

@MarshallOfSound MarshallOfSound merged commit 498f4bc into main Jun 24, 2025
58 checks passed
@MarshallOfSound MarshallOfSound deleted the sam/fix-push-patch branch June 24, 2025 05:26
@release-clerk
Copy link

release-clerk bot commented Jun 24, 2025

No Release Notes

@trop
Copy link
Contributor

trop bot commented Jun 24, 2025

I have automatically backported this PR to "37-x-y", please check out #47530

@trop
Copy link
Contributor

trop bot commented Jun 24, 2025

I have automatically backported this PR to "36-x-y", please check out #47531

@trop
Copy link
Contributor

trop bot commented Jun 24, 2025

I have automatically backported this PR to "34-x-y", please check out #47532

@trop
Copy link
Contributor

trop bot commented Jun 24, 2025

I have automatically backported this PR to "35-x-y", please check out #47533

@trop trop bot added in-flight/36-x-y in-flight/34-x-y in-flight/35-x-y and removed target/36-x-y PR should also be added to the "36-x-y" branch. target/34-x-y PR should also be added to the "34-x-y" branch. labels Jun 24, 2025
@trop trop bot added merged/36-x-y PR was merged to the "36-x-y" branch. merged/34-x-y PR was merged to the "34-x-y" branch. merged/35-x-y PR was merged to the "35-x-y" branch. merged/37-x-y PR was merged to the "37-x-y" branch. and removed target/35-x-y PR should also be added to the "35-x-y" branch. in-flight/36-x-y in-flight/34-x-y in-flight/35-x-y in-flight/37-x-y labels Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged/34-x-y PR was merged to the "34-x-y" branch. merged/35-x-y PR was merged to the "35-x-y" branch. merged/36-x-y PR was merged to the "36-x-y" branch. merged/37-x-y PR was merged to the "37-x-y" branch. semver/none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants