ci: squash with previous commit once the job has created a new one

null8626 · Oct 28, 2024 · 486c560 · 486c560
1 parent ab4a6cc
commit 486c560
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -15,6 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Pull previous commit
+        run: git reset --soft HEAD~1
+        shell: bash
       - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
@@ -45,6 +50,7 @@ jobs:
         uses: EndBug/add-and-commit@v9
         with:
           commit: -S
-          message: 'style: prettier'
+          message: ${{ github.event.head_commit.message }}
+          push: --force
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -13,6 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Pull previous commit
+        run: git reset --soft HEAD~1
+        shell: bash
       - uses: actions/setup-python@v5
         with:
           python-version: '3.13'
@@ -33,6 +38,7 @@ jobs:
         uses: EndBug/add-and-commit@v9
         with:
           commit: -S
-          message: 'chore: update changelog.rst'
+          message: ${{ github.event.head_commit.message }}
+          push: --force
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}