Revert "ci: avoid leftover changelog update branches" (#72836)

This reverts commit 4f43797. https://discord.com/channels/598523535169945603/598529174302490644/1225329932281053204 and the conversation above for context tl;dr bring back #65080 's changes, turns out its purpose is keeping each weekly changelog update separate from one another; the review process can take more than a week :derpy: Co-authored-by: casswedson <[email protected]>
CleverRaven · Apr 5, 2024 · a5f165a · a5f165a
1 parent 0898a35
commit a5f165a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/format_emscripten.yml b/.github/workflows/format_emscripten.yml
@@ -54,6 +54,7 @@ jobs:
           commit-message: JSON linter gh-pages file update
           base: gh-pages
           branch: gh-pages-json-linter-update
+          branch-suffix: short-commit-hash
           delete-branch: true
           add-paths: formatter.html
           title: Update Github Pages JSON linter page

diff --git a/.github/workflows/weekly-changelog.yml b/.github/workflows/weekly-changelog.yml
@@ -39,7 +39,7 @@ jobs:
           committer: David Seguin <[email protected]>
           author: David Seguin <[email protected]>
           token: ${{ secrets.TX_PR_CREATOR }}
-          branch: weekly-changelog
+          branch: changelog-weekly-${{ steps.getting-changes.outputs.date }}
           delete-branch: true
           base: master
           title: Weekly Changelog ${{ steps.getting-changes.outputs.old_date }} to ${{ steps.getting-changes.outputs.date }}