diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 83b20ddd6f6..877273d7645 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -8,7 +8,6 @@ env: GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }} PR_NUMBER: ${{ github.event.number }} - CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }} jobs: changelog: @@ -55,7 +54,3 @@ jobs: git push shell: bash continue-on-error: true - - - name: Publish changelog - run: Tools/actions_changelogs_since_last_run.py - continue-on-error: true diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py index 1c6d27d659d..d54c1ee153c 100755 --- a/Tools/actions_changelogs_since_last_run.py +++ b/Tools/actions_changelogs_since_last_run.py @@ -16,12 +16,10 @@ GITHUB_REPOSITORY = os.environ["GITHUB_REPOSITORY"] GITHUB_RUN = os.environ["GITHUB_RUN_ID"] GITHUB_TOKEN = os.environ["GITHUB_TOKEN"] -CHANGELOG_DIR = os.environ["CHANGELOG_DIR"] -CHANGELOG_WEBHOOK = os.environ["CHANGELOG_WEBHOOK"] -PR_NUMBER = os.environ["PR_NUMBER"] # https://discord.com/developers/docs/resources/webhook DISCORD_SPLIT_LIMIT = 2000 +DISCORD_WEBHOOK_URL = os.environ.get("DISCORD_WEBHOOK_URL") TYPES_TO_EMOJI = { "Fix": "🐛", @@ -33,7 +31,7 @@ ChangelogEntry = dict[str, Any] def main(): - if not CHANGELOG_WEBHOOK: + if not DISCORD_WEBHOOK_URL: return session = requests.Session() @@ -134,12 +132,12 @@ def get_discord_body(content: str): def send_discord(content: str): body = get_discord_body(content) - response = requests.post(CHANGELOG_WEBHOOK, json=body) + response = requests.post(DISCORD_WEBHOOK_URL, json=body) response.raise_for_status() def send_to_discord(entries: Iterable[ChangelogEntry]) -> None: - if not CHANGELOG_WEBHOOK: + if not DISCORD_WEBHOOK_URL: print(f"No discord webhook URL found, skipping discord send") return