From d51b375a03165b7639010d93b0cb323229431063 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 19 Jan 2026 17:59:04 +0000 Subject: [PATCH] Drop unneeded version tag argument --- .github/workflows/post-release-mergeback.yml | 3 +-- .github/workflows/rollback-release.yml | 3 +-- .github/workflows/script/prepare_changelog.py | 10 ++++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index 71091e6d4..95e66ecd7 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -123,9 +123,8 @@ jobs: - name: Prepare partial Changelog env: PARTIAL_CHANGELOG: "${{ runner.temp }}/partial_changelog.md" - VERSION: "${{ steps.getVersion.outputs.version }}" run: | - python .github/workflows/script/prepare_changelog.py CHANGELOG.md "$VERSION" > $PARTIAL_CHANGELOG + python .github/workflows/script/prepare_changelog.py CHANGELOG.md > $PARTIAL_CHANGELOG echo "::group::Partial CHANGELOG" cat $PARTIAL_CHANGELOG diff --git a/.github/workflows/rollback-release.yml b/.github/workflows/rollback-release.yml index 5c3b7efdd..4b5b68cf3 100644 --- a/.github/workflows/rollback-release.yml +++ b/.github/workflows/rollback-release.yml @@ -127,9 +127,8 @@ jobs: env: NEW_CHANGELOG: "${{ runner.temp }}/new_changelog.md" PARTIAL_CHANGELOG: "${{ runner.temp }}/partial_changelog.md" - VERSION: "${{ needs.prepare.outputs.version }}" run: | - python .github/workflows/script/prepare_changelog.py $NEW_CHANGELOG "$VERSION" > $PARTIAL_CHANGELOG + python .github/workflows/script/prepare_changelog.py $NEW_CHANGELOG > $PARTIAL_CHANGELOG echo "::group::Partial CHANGELOG" cat $PARTIAL_CHANGELOG diff --git a/.github/workflows/script/prepare_changelog.py b/.github/workflows/script/prepare_changelog.py index 8be8d836f..dafb84b39 100755 --- a/.github/workflows/script/prepare_changelog.py +++ b/.github/workflows/script/prepare_changelog.py @@ -7,7 +7,7 @@ EMPTY_CHANGELOG = 'No changes.\n\n' # Prepare the changelog for the new release # This function will extract the part of the changelog that # we want to include in the new release. -def extract_changelog_snippet(changelog_file, version_tag): +def extract_changelog_snippet(changelog_file): output = '' if (not os.path.exists(changelog_file)): output = EMPTY_CHANGELOG @@ -29,9 +29,7 @@ def extract_changelog_snippet(changelog_file, version_tag): return output.strip() -if len(sys.argv) < 3: - raise Exception('Expecting argument: changelog_file version_tag') +if len(sys.argv) < 2: + raise Exception('Expecting argument: changelog_file') changelog_file = sys.argv[1] -version_tag = sys.argv[2] - -print(extract_changelog_snippet(changelog_file, version_tag)) +print(extract_changelog_snippet(changelog_file))