Handle multiple PRs and contributors in changelog generation + Simplify CR handling

Author: Wires77

.github/workflows/beta.yml

@@ -21,10 +21,6 @@ jobs:
               run: |
                 git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
                 git config --global user.name "github-actions[bot]"
-            # The hash suffix will help identifying if the beta version is up-to-date
-            - name: Add commit hash suffix to manifest version
-              run: |
-                sed -i "s/<Version number=\"\([^\"]*\)\"/<Version number=\"\1-$(git rev-parse --short HEAD)\"/g" manifest.xml
             - name: Generate Release notes
               run: |
                 echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
@@ -38,11 +34,18 @@ jobs:
                 gh release create beta --title "Beta Release" --draft --generate-notes --notes-start-tag "$LATEST_TAG"
                 gh release view beta > temp_change.md
             - name: Tweak changelogs
+              id: tweak-changelogs
+              continue-on-error: true
               run: |
                 # Remove carriage returns to be able to run the script
                 sed -i 's/\r$//' .github/tweak_changelogs.sh
                 chmod +x .github/tweak_changelogs.sh
                 .github/tweak_changelogs.sh beta
+            # The hash suffix will help identifying if the beta version is up-to-date
+            - name: Add commit hash suffix to manifest version
+              if: steps.tweak-changelogs.outcome == 'success'
+              run: |
+                sed -i "s/<Version number=\"\([^\"]*\)\"/<Version number=\"\1-$(git rev-parse --short HEAD)\"/g" manifest.xml
             - name: Update manifest.xml
               run: python3 update_manifest.py --quiet --in-place
             - name: Push to beta branch