Amend latest commit instead of creating a new one for version bump (#723)

Amend latest commit instead of creating a new one

The version's patch number equals the commit count. Creating a new
commit changes that count, causing invoke setver to find another
version bump on the next CD run — an infinite loop.

Amending the triggering commit keeps the count unchanged, so the
subsequent CD run finds no version change and stops.

Uses --amend -C HEAD to preserve the original commit author (bot
becomes committer only) and --force-with-lease to prevent
overwriting any concurrent push that landed since checkout.

Author: CasperWA

.github/workflows/cd_release.yml

@@ -71,11 +71,11 @@ jobs:
       if: steps.update_version_step.outputs.continue_workflow == 'true'
       run: |
         git add app/__init__.py CHANGELOG.md
-        git commit -m "[bot] Update version and CHANGELOG"
+        git commit --amend -C HEAD
 
     - name: Update '${{ env.DEFAULT_REPO_BRANCH }}'
       if: steps.update_version_step.outputs.continue_workflow == 'true'
-      run: git push origin ${{ env.DEFAULT_REPO_BRANCH }}
+      run: git push --force-with-lease origin ${{ env.DEFAULT_REPO_BRANCH }}
 
   publish_container_image:
     name: Publish Container image on GH Packages

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 **Merged pull requests:**
 
+- Amend latest commit instead of creating a new one for version bump [\#723](https://github.com/EMMC-ASBL/oteapi-services/pull/723) ([CasperWA](https://github.com/CasperWA))
 - Replace push-protected with direct push via TEAM4-0 bypass [\#721](https://github.com/EMMC-ASBL/oteapi-services/pull/721) ([CasperWA](https://github.com/CasperWA))
 - Remove \[skip ci\] from bot commit message in CD release [\#720](https://github.com/EMMC-ASBL/oteapi-services/pull/720) ([CasperWA](https://github.com/CasperWA))
 - \[pre-commit.ci\] pre-commit autoupdate [\#717](https://github.com/EMMC-ASBL/oteapi-services/pull/717) ([pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci))

app/__init__.py

@@ -6,6 +6,6 @@
 
 from __future__ import annotations
 
-__version__ = "1.20260421.520"
+__version__ = "1.20260421.522"
 __author__ = "SINTEF"
 __author_email__ = "Team4.0@SINTEF.no"