From 2c5a37525cf30bfb273afba670ecceaf50008849 Mon Sep 17 00:00:00 2001 From: di-sukharev Date: Sat, 20 May 2023 22:00:45 +0800 Subject: [PATCH] build --- out/github-action.cjs | 5 +++-- src/github-action.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/out/github-action.cjs b/out/github-action.cjs index bb27468..2329042 100644 --- a/out/github-action.cjs +++ b/out/github-action.cjs @@ -27331,11 +27331,12 @@ async function run(retries = 3) { pull_number: payload.pull_request.number }); const commits = commitsResponse.data; + await import_exec.default.exec("git", ["checkout", sourceBranch]); await import_exec.default.exec("git", ["fetch", "--all"]); - await import_exec.default.exec("git", ["checkout", `origin/${sourceBranch}`]); + await import_exec.default.exec("git", ["pull"]); await import_exec.default.exec("git", ["status"]); await import_exec.default.exec("git", ["log", "--oneline"]); - await import_exec.default.exec("git", ["rev-list", "--count", sourceBranch]); + await import_exec.default.exec("git", ["git rev-list", "--count", sourceBranch]); await improveCommitMessagesWithRebase({ commits, base: baseBranch, diff --git a/src/github-action.ts b/src/github-action.ts index f269b27..57b2c45 100644 --- a/src/github-action.ts +++ b/src/github-action.ts @@ -221,11 +221,12 @@ async function run(retries = 3) { const commits = commitsResponse.data; // --- TEST --- + await exec.exec('git', ['checkout', sourceBranch]); await exec.exec('git', ['fetch', '--all']); - await exec.exec('git', ['checkout', `origin/${sourceBranch}`]); + await exec.exec('git', ['pull']); await exec.exec('git', ['status']); await exec.exec('git', ['log', '--oneline']); - await exec.exec('git', ['rev-list', '--count', sourceBranch]); + await exec.exec('git', ['git rev-list', '--count', sourceBranch]); // --- TEST --- await improveCommitMessagesWithRebase({