Merge remote-tracking branch 'origin/master'

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

.gitea/workflows/generate-iso.yaml

@@ -94,12 +94,12 @@ jobs:
       ### https://github.com/actions/checkout/issues/1843
       - name: Using manual clone via SSH to circumvent Gitea SHA-256 object issues.
         shell: bash
-        run: |
-          git clone --branch "${GITHUB_REF_NAME}" ssh://git@git.coresecret.dev:42842/msw/CISS.debian.live.builder.git .
-          git fetch --unshallow || echo "Nothing to fetch - already full clone."
         env:
           ### GITHUB_REF_NAME contains the branch name from the push event.
           GITHUB_REF_NAME: ${{ github.ref_name }}
+        run: |
+          git clone --branch "${GITHUB_REF_NAME}" ssh://git@git.coresecret.dev:42842/msw/CISS.debian.live.builder.git .
+          git fetch --unshallow || echo "Nothing to fetch - already full clone."
 
       - name: Cleaning the workspace.
         shell: bash
@@ -264,28 +264,39 @@ jobs:
             "${VAR_ISO_FILE_SHA512}"
           CISS.debian.live.builder ISO sha512 sign :
             $(< "${SIGNATURE_FILE}")
+
+          # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=text
           EOF
 
+      - name: Sync with remote before commit to avoid Job Race Conditions.
+        shell: bash
+        env:
+          GIT_SSH_COMMAND: "ssh -p 42842"
+        run: |
+          export GNUPGHOME="$(pwd)/.gnupg"
+          git fetch origin master
+          git rebase origin/master
+
       - name: Stage generated files.
         shell: bash
+        env:
+          GIT_SSH_COMMAND: "ssh -p 42842"
         run: |
           PRIVATE_FILE="LIVE_ISO.private"
           git add "${PRIVATE_FILE}"
-        env:
-          GIT_SSH_COMMAND: "ssh -p 42842"
 
       - name: Commit and Sign changes.
         shell: bash
+        env:
+          GIT_SSH_COMMAND: "ssh -p 42842"
         run: |
           export GNUPGHOME="$(pwd)/.gnupg"
           git commit -S -m "DEPLOY BOT: Auto-Generate LIVE ISO [skip ci]" || echo "No Changes, nothing to Sign or to Commit."
-        env:
-          GIT_SSH_COMMAND: "ssh -p 42842"
 
       - name: Push back to Repository.
         shell: bash
-        run: |
-          git push origin HEAD:${GITHUB_REF_NAME}
         env:
           GIT_SSH_COMMAND: "ssh -p 42842"
+        run: |
+          git push origin HEAD:${GITHUB_REF_NAME}
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml