update

2026-06-30 15:01:45 +02:00
parent 38f97713c6
commit cde255d8c3
1 changed files with 3 additions and 1 deletions
@@ -85,7 +85,9 @@ jobs:
        run: |
          git config user.name '${{ vars.USERNAME_GIT }}'
          git config user.email '${{ vars.EMAIL_GIT }}'
-          git add package.json src-tauri/tauri.conf.json
+          # npm version also bumps the version inside package-lock.json, so stage it
+          # too -- otherwise it stays as an unstaged change and blocks the rebase.
+          git add package.json package-lock.json src-tauri/tauri.conf.json

          git commit -m 'Update version to ${{ github.ref_name }}'
          if ($LASTEXITCODE -ne 0) {