From a5f165a68188a9f00431e61d488ffdbff001766f Mon Sep 17 00:00:00 2001 From: casswedson <58050969+casswedson@users.noreply.github.com> Date: Thu, 4 Apr 2024 23:40:33 -0500 Subject: [PATCH] Revert "ci: avoid leftover changelog update branches" (#72836) This reverts commit 4f4379715e95c6b85087f912bda9b910e2a12988. 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 --- .github/workflows/format_emscripten.yml | 1 + .github/workflows/weekly-changelog.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/format_emscripten.yml b/.github/workflows/format_emscripten.yml index fb9e72d23afa0..82c1993cd2096 100644 --- 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 index a73f418894126..9fdfe6f70b617 100644 --- a/.github/workflows/weekly-changelog.yml +++ b/.github/workflows/weekly-changelog.yml @@ -39,7 +39,7 @@ jobs: committer: David Seguin author: David Seguin 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 }}