From bd5065d879ca2e56c7bc1709b31a485a01fed63b Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Mon, 18 Aug 2025 22:40:13 +0530 Subject: [PATCH 1/2] ci: remove pull --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0af10cf..ca402aa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -46,7 +46,6 @@ jobs: run: | git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - git pull --rebase origin ${{ github.head_ref }} git add . git diff --cached --quiet || git commit -m "ci: update generated cookiecutter template from example" git push origin HEAD:${{ github.head_ref }} From d81c3d50be0de199bfbc618cd808319435b8b4d4 Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Mon, 18 Aug 2025 22:49:18 +0530 Subject: [PATCH 2/2] ci: add checkout ref --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ca402aa..652ed49 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,6 +35,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} - name: Make script executable run: chmod +x ./generate-cookiecutter-template-from-example-project.sh - name: Generate cookiecutter template