chore: Use custom action to commit changes in CI instead of git commit

Author: fnesveda

.github/workflows/check-execute-workflow-dist.yaml

@@ -32,10 +32,19 @@ jobs:
       - name: Rebuild dist
         run: pnpm --filter execute-workflow build
 
+      - name: Stage dist changes
+        id: stage
+        run: |
+          git add 'execute-workflow/dist/'
+          if git diff --cached --quiet; then
+            echo "has-changes=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "has-changes=true" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Commit and push if changed
-        uses: EndBug/add-and-commit@v10
+        if: steps.stage.outputs.has-changes == 'true'
+        uses: ./commit
         with:
-          author_name: github-actions[bot]
-          author_email: 41898282+github-actions[bot]@users.noreply.github.com
-          message: "chore: rebuild execute-workflow dist [skip ci]"
-          add: 'execute-workflow/dist/'
+          commit-message: "chore: rebuild execute-workflow dist [skip ci]"
+          github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}

.github/workflows/claude-md-maintenance.yml

@@ -97,24 +97,35 @@ jobs:
             echo "changed=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Prepare branch name
+        if: steps.diff.outputs.changed == 'true'
+        id: branch
+        run: echo "name=chore/update-claude-md-$(date +%Y%m%d%H%M%S)" >> "$GITHUB_OUTPUT"
+
+      - name: Stage CLAUDE.md
+        if: steps.diff.outputs.changed == 'true'
+        run: git add CLAUDE.md
+
+      - name: Commit CLAUDE.md
+        if: steps.diff.outputs.changed == 'true'
+        uses: apify/workflows/commit@main
+        with:
+          commit-message: "docs: update CLAUDE.md [skip ci]"
+          github-token: ${{ github.token }}
+          branch: ${{ steps.branch.outputs.name }}
+          create-branch: 'true'
+
       - name: Create PR with updated CLAUDE.md
         if: steps.diff.outputs.changed == 'true'
         id: create-pr
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          git config user.name  "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          BRANCH="chore/update-claude-md-$(date +%Y%m%d%H%M%S)"
-          git checkout -b "$BRANCH"
-          git add CLAUDE.md
-          git commit -m "docs: update CLAUDE.md [skip ci]"
-          git push origin "$BRANCH"
           PR_URL=$(gh pr create \
             --title "docs: update CLAUDE.md" \
             --body "Automated update of CLAUDE.md generated by the Claude MD Maintenance workflow." \
             --base "${{ github.ref_name }}" \
-            --head "$BRANCH")
+            --head "${{ steps.branch.outputs.name }}")
           echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
 
       - name: Assign PR and request review

.github/workflows/python_bump_and_update_changelog.yaml

@@ -27,7 +27,7 @@ jobs:
   bump_and_update_changelog:
     runs-on: ubuntu-latest
     outputs:
-      changelog_commitish: ${{ steps.commit.outputs.commit_long_sha || github.sha }}
+      changelog_commitish: ${{ steps.commit.outputs.commit-sha || github.sha }}
 
     steps:
       - name: Checkout repository
@@ -59,11 +59,21 @@ jobs:
           write-mode: overwrite
           contents: ${{ inputs.changelog }}
 
+      - name: Stage changes
+        id: stage
+        run: |
+          git pull --rebase --autostash
+          git add -A
+          if git diff --cached --quiet; then
+            echo "has-changes=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "has-changes=true" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Commit changes
         id: commit
-        uses: EndBug/add-and-commit@v10
+        if: steps.stage.outputs.has-changes == 'true'
+        uses: apify/workflows/commit@main
         with:
-          author_name: github-actions[bot]
-          author_email: 41898282+github-actions[bot]@users.noreply.github.com
-          message: "chore(release): Update changelog and package version [skip ci]"
-          pull: '--rebase --autostash'
+          commit-message: "chore(release): Update changelog and package version [skip ci]"
+          github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}

.github/workflows/sync_branches_push.yaml

@@ -45,7 +45,9 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - name: git
+      - name: Merge head branch into base branch via GitHub API
+        env:
+          GH_TOKEN: ${{ secrets.githubToken }}
         run: |
           if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
             HEAD_BRANCH="${GITHUB_BASE_REF}"
@@ -55,17 +57,11 @@ jobs:
             echo ">>> Don't know how to handle event name: ${GITHUB_EVENT_NAME}"
             exit 1
           fi
-          mkdir repo
-          cd repo
-          git clone https://github-actions:${{ secrets.githubToken }}@github.com/${{ github.repository }}.git .
 
-          git config --global user.email "${{ inputs.gitConfigEmail }}"
-          git config --global user.name "${{ inputs.gitConfigUsername }}"
-          git config pull.rebase false
-
-          git switch ${{ inputs.baseBranch }}
-          git pull origin ${HEAD_BRANCH} --no-edit --no-ff
-          git push https://github-actions:${{ secrets.githubToken }}@github.com/${{ github.repository }}.git ${{ inputs.baseBranch }}:${{ inputs.baseBranch }}
+          gh api -X POST "repos/${GITHUB_REPOSITORY}/merges" \
+            -f base="${{ inputs.baseBranch }}" \
+            -f head="${HEAD_BRANCH}" \
+            -f commit_message="Merge ${HEAD_BRANCH} into ${{ inputs.baseBranch }}"
 
       - name: report failure to slack
         if: ${{ failure() }}

git-cliff-release/README.md

@@ -47,12 +47,13 @@ jobs:
           path: CHANGELOG.md
           write-mode: overwrite
           contents: ${{ steps.metadata.outputs.changelog }}
+      - name: Stage changes
+        run: git add -A
       - name: Commit changes
-        uses: EndBug/add-and-commit@v10
+        uses: apify/workflows/commit@main
         with:
-          author_name: Foo
-          author_email: foo@bar.com
-          message: "chore(release): Update changelog and package version [skip ci]"
+          commit-message: "chore(release): Update changelog and package version [skip ci]"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 ```
 
 Manually trigger a release:
@@ -93,18 +94,19 @@ jobs:
           path: CHANGELOG.md
           write-mode: overwrite
           contents: ${{ steps.metadata.outputs.changelog }}
+      - name: Stage changes
+        run: git add -A
       - name: Commit changes
         id: commit
-        uses: EndBug/add-and-commit@v10
+        uses: apify/workflows/commit@main
         with:
-          author_name: Foo
-          author_email: foo@bar.com
-          message: "chore(release): Update changelog and package version [skip ci]"
+          commit-message: "chore(release): Update changelog and package version [skip ci]"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.metadata.outputs.tag_name }}
           name: ${{ steps.metadata.outputs.version_number }}
-          target_commitish: ${{ steps.commit.commit_long_sha || github.sha }}
+          target_commitish: ${{ steps.commit.outputs.commit-sha || github.sha }}
           body: ${{ steps.metadata.outputs.release_notes }}
 ```