Merge pull request #1398 from jiridanek/jd_parallel_locking

Run the pipfile.lock update github action in parallel over Python versions

Author: atheo89

.github/workflows/piplock-renewal.yaml

@@ -40,7 +40,6 @@ jobs:
       cancel-in-progress: false
     strategy:
       fail-fast: false
-      max-parallel: 1
       matrix:
         python-version: >-
           ${{ fromJSON( github.event.inputs.python_version || '["3.11", "3.12"]' ) }}
@@ -74,8 +73,15 @@ jobs:
         run: |
           make refresh-pipfilelock-files PYTHON_VERSION=${{ matrix.python-version }} INCLUDE_OPT_DIRS=${{ env.INCLUDE_OPT_DIRS }}
 
-      - name: Push the changes back to the branch
+      - name: Pull latest changes safely
         run: |
           git add .
-          git commit -m "Update Pipfile.lock files by piplock-renewal.yaml action"
+          git stash push -m "pre-pull-stash" || true
+          git pull --rebase origin ${{ env.BRANCH }}
+          git stash pop || true
+
+      - name: Commit and push changes (if any)
+        run: |
+          git add .
+          git diff --cached --quiet && echo "No changes to commit." || git commit -m "Update Pipfile.lock for Python ${{ matrix.python-version }}"
           git push origin ${{ env.BRANCH }}