From c60d2aa626ab7399fae599fc2e795e4eeb48b91a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Feb 2023 10:43:07 +0000 Subject: [PATCH] Move the `1:` prefix to `tools/changelog.py` when generating the deb changelog Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/scheduled.yml | 4 ++-- .github/workflows/staging.yml | 4 ++-- .github/workflows/templates/ci.yml.jinja | 4 ++-- tools/changelog.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfccdd71b30..b83bdec60bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,8 +260,8 @@ jobs: - name: Update Debian changelog shell: bash run: | - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" --draft - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" - name: Update RPM changelog shell: bash diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d3deb4e8111..622ec7ad10b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -258,8 +258,8 @@ jobs: - name: Update Debian changelog shell: bash run: | - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" --draft - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" - name: Update RPM changelog shell: bash diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index b77d7eb0d62..6d9c5810bb6 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -258,8 +258,8 @@ jobs: - name: Update Debian changelog shell: bash run: | - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" --draft - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" - name: Update RPM changelog shell: bash diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 7905741b3e4..fe15028fbfa 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -300,8 +300,8 @@ jobs: - name: Update Debian changelog shell: bash run: | - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" --draft - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" - name: Update RPM changelog shell: bash diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index c0a13f54f45..68928b8bf4b 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -103,8 +103,8 @@ on: - name: Update Debian changelog shell: bash run: | - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" --draft - tools changelog update-deb "1:${{ needs.prepare-workflow.outputs.salt-version }}" + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" --draft + tools changelog update-deb "${{ needs.prepare-workflow.outputs.salt-version }}" - name: Update RPM changelog shell: bash diff --git a/tools/changelog.py b/tools/changelog.py index 5c532d3994f..770ab435005 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -259,7 +259,7 @@ def update_deb(ctx: Context, salt_version: Version, draft: bool = False): debian_changelog_path = "pkg/debian/changelog" tmp_debian_changelog_path = f"{debian_changelog_path}.1" with open(tmp_debian_changelog_path, "w") as wfp: - wfp.write(f"salt ({salt_version}) stable; urgency=medium\n\n") + wfp.write(f"salt (1:{salt_version}) stable; urgency=medium\n\n") wfp.write(formated) wfp.write( f"\n -- Salt Project Packaging {date}\n\n"