mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: fail for out of date patches on forks (#46126)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-03-20 09:56:55 +01:00 • committed by GitHub
parent ef22986d1d
commit d23aaadcd5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/actions/checkout/action.yml vendored
View file

@ -99,7 +99,7 @@ runs:
fi fi
ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags -vv ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags -vv
if [[ "${{ inputs.is-release }}" != "true" && -n "${{ env.PATCH_UP_APP_CREDS }}" ]]; then if [[ "${{ inputs.is-release }}" != "true" ]]; then
# Re-export all the patches to check if there were changes. # Re-export all the patches to check if there were changes.
python3 src/electron/script/export_all_patches.py src/electron/patches/config.json python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
cd src/electron cd src/electron

14
script/push-patch.js
View file

@ -2,23 +2,31 @@ const { appCredentialsFromString, getTokenForRepo } = require('@electron/github-
const cp = require('node:child_process'); const cp = require('node:child_process');
const { PATCH_UP_APP_CREDS } = process.env;
async function main () { async function main () {
if (!PATCH_UP_APP_CREDS) {
throw new Error('PATCH_UP_APP_CREDS environment variable not set');
}
const token = await getTokenForRepo( const token = await getTokenForRepo(
{ {
name: 'electron', name: 'electron',
owner: 'electron' owner: 'electron'
}, },
appCredentialsFromString(process.env.PATCH_UP_APP_CREDS) appCredentialsFromString(PATCH_UP_APP_CREDS)
); );
const remoteURL = `https://x-access-token:${token}@github.com/electron/electron.git`; const remoteURL = `https://x-access-token:${token}@github.com/electron/electron.git`;
// NEVER LOG THE OUTPUT OF THIS COMMAND // NEVER LOG THE OUTPUT OF THIS COMMAND
// GIT LEAKS THE ACCESS CREDENTIALS IN CONSOLE LOGS // GIT LEAKS THE ACCESS CREDENTIALS IN CONSOLE LOGS
const { status } = cp.spawnSync('git', ['push', '--set-upstream', remoteURL], { const { status } = cp.spawnSync('git', ['push', '--set-upstream', remoteURL], {
stdio: 'ignore' stdio: 'ignore'
}); });
if (status !== 0) { if (status !== 0) {
console.error('Failed to push to target branch'); throw new Error('Failed to push to target branch');
process.exit(1);
} }
} }