diff --git a/.gitea/workflows/app_builder.yaml b/.gitea/workflows/app_builder.yaml index 6aba356..5645c24 100644 --- a/.gitea/workflows/app_builder.yaml +++ b/.gitea/workflows/app_builder.yaml @@ -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) {