Move the 1: prefix to tools/changelog.py when generating the deb changelog

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-02-28 10:43:07 +00:00 committed by Pedro Algarvio
parent 2e6a10d3dd
commit c60d2aa626
6 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 <saltproject-packaging@vmware.com> {date}\n\n"