From dde5b2ed89577b13b63167a46fe91ef683270f2e Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 17 Oct 2024 09:36:40 +0200 Subject: [PATCH 1/4] chore: add co-author to generated commit --- scripts/ci/codegen/pushGeneratedCode.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/ci/codegen/pushGeneratedCode.ts b/scripts/ci/codegen/pushGeneratedCode.ts index 6daff2b8fbf..07a2112c7e4 100644 --- a/scripts/ci/codegen/pushGeneratedCode.ts +++ b/scripts/ci/codegen/pushGeneratedCode.ts @@ -53,24 +53,21 @@ export async function pushGeneratedCode(): Promise { return; } - const skipCi = isMainBranch ? '[skip ci]' : ''; - let message = await run(`git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi}"`); - const authors = await run( - `git show -s ${baseBranch} --format=" -Co-authored-by: %an <%ae> -%(trailers:key=Co-authored-by)"`, - ); - - if (IS_RELEASE_COMMIT && isMainBranch) { + let skipCi = ''; + if (IS_RELEASE_COMMIT || isMainBranch) { console.log('Processing release commit'); - message = `${text.commitReleaseMessage} [skip ci]`; + skipCi = '[skip ci]'; } - message += authors; + const commitMessage = await run( + `git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi} +Co-authored-by: %an <%ae> +%(trailers:key=Co-authored-by)"`, + ); console.log(`Pushing code to generated branch: '${branchToPush}'`); await run('git add .'); - await run(`git commit -m "${message.replaceAll('"', '\\"')}"`); + await run(`git commit -m "${commitMessage.replaceAll('"', '\\"')}"`); await run(`git push origin ${branchToPush}`); setOutput('GENERATED_COMMIT', await run('git rev-parse HEAD')); From 8a983566ba102b7d3f9584f95428b298561c19fd Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 17 Oct 2024 09:43:18 +0200 Subject: [PATCH 2/4] fix: one empty line --- scripts/ci/codegen/pushGeneratedCode.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/codegen/pushGeneratedCode.ts b/scripts/ci/codegen/pushGeneratedCode.ts index 07a2112c7e4..411a773b3ad 100644 --- a/scripts/ci/codegen/pushGeneratedCode.ts +++ b/scripts/ci/codegen/pushGeneratedCode.ts @@ -61,6 +61,7 @@ export async function pushGeneratedCode(): Promise { const commitMessage = await run( `git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi} + Co-authored-by: %an <%ae> %(trailers:key=Co-authored-by)"`, ); From 4b6bc99666fa77b8786f876dc8e708af8f0b95b9 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 17 Oct 2024 10:55:50 +0200 Subject: [PATCH 3/4] chore: maybe just that actually --- scripts/ci/codegen/pushGeneratedCode.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/ci/codegen/pushGeneratedCode.ts b/scripts/ci/codegen/pushGeneratedCode.ts index 411a773b3ad..2eecaf690c6 100644 --- a/scripts/ci/codegen/pushGeneratedCode.ts +++ b/scripts/ci/codegen/pushGeneratedCode.ts @@ -53,22 +53,25 @@ export async function pushGeneratedCode(): Promise { return; } - let skipCi = ''; - if (IS_RELEASE_COMMIT || isMainBranch) { - console.log('Processing release commit'); - skipCi = '[skip ci]'; - } - - const commitMessage = await run( - `git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi} + const skipCi = isMainBranch ? '[skip ci]' : ''; + let message = await run(`git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi}"`); + const authors = await run( + `git show -s ${baseBranch} --format=" Co-authored-by: %an <%ae> %(trailers:key=Co-authored-by)"`, ); + if (IS_RELEASE_COMMIT && isMainBranch) { + console.log('Processing release commit'); + message = `${text.commitReleaseMessage} [skip ci]`; + } + + message += authors; + console.log(`Pushing code to generated branch: '${branchToPush}'`); await run('git add .'); - await run(`git commit -m "${commitMessage.replaceAll('"', '\\"')}"`); + await run(`git commit -m "${message.replaceAll('"', '\\"')}"`); await run(`git push origin ${branchToPush}`); setOutput('GENERATED_COMMIT', await run('git rev-parse HEAD')); From eedb11edf8d3b18e5e1cb26da006556faac6468d Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 17 Oct 2024 10:58:48 +0200 Subject: [PATCH 4/4] chore: or just that --- scripts/ci/codegen/pushGeneratedCode.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/ci/codegen/pushGeneratedCode.ts b/scripts/ci/codegen/pushGeneratedCode.ts index 2eecaf690c6..369b596b851 100644 --- a/scripts/ci/codegen/pushGeneratedCode.ts +++ b/scripts/ci/codegen/pushGeneratedCode.ts @@ -53,25 +53,22 @@ export async function pushGeneratedCode(): Promise { return; } - const skipCi = isMainBranch ? '[skip ci]' : ''; - let message = await run(`git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi}"`); - const authors = await run( - `git show -s ${baseBranch} --format=" + let baseMessage = `%s ${text.commitEndMessage}`; + if (IS_RELEASE_COMMIT || isMainBranch) { + console.log('Processing release commit'); + baseMessage = `${text.commitReleaseMessage} [skip ci]`; + } + + const commitMessage = await run( + `git show -s ${baseBranch} --format="${baseMessage} Co-authored-by: %an <%ae> %(trailers:key=Co-authored-by)"`, ); - if (IS_RELEASE_COMMIT && isMainBranch) { - console.log('Processing release commit'); - message = `${text.commitReleaseMessage} [skip ci]`; - } - - message += authors; - console.log(`Pushing code to generated branch: '${branchToPush}'`); await run('git add .'); - await run(`git commit -m "${message.replaceAll('"', '\\"')}"`); + await run(`git commit -m "${commitMessage.replaceAll('"', '\\"')}"`); await run(`git push origin ${branchToPush}`); setOutput('GENERATED_COMMIT', await run('git rev-parse HEAD'));