diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index f2c783d654..f353d4c8f0 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,7 +19,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }} - ref: ${{ github.event.pull_request.head.sha || github.sha }} + ref: ${{ github.event.pull_request.head.ref || github.ref_name }} - name: Setup Bun uses: ./.github/actions/setup-bun @@ -29,3 +29,4 @@ jobs: ./script/format.ts env: CI: true + PUSH_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }} diff --git a/script/format.ts b/script/format.ts index f5a54a57fc..2ae93f169c 100755 --- a/script/format.ts +++ b/script/format.ts @@ -9,5 +9,6 @@ if (process.env["CI"] && (await $`git status --porcelain`.text())) { await $`git config --local user.name "GitHub Action"` await $`git add -A` await $`git commit -m "chore: format code"` - await $`git push --no-verify` + const branch = process.env["PUSH_BRANCH"] + await $`git push origin HEAD:${branch} --no-verify` }