diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98edca9bdf..e36bacf856 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,8 @@ on: merge_group: workflow_dispatch: inputs: + handwritten: + description: 'Small changelog:' # Run with this periodically to analyze the image again # As package drift will make the plan eventually non-ideal # (existing users will have to redownload most of the image) diff --git a/.github/workflows/changelog.py b/.github/workflows/changelog.py index ba3de62f75..188ea2debb 100644 --- a/.github/workflows/changelog.py +++ b/.github/workflows/changelog.py @@ -44,6 +44,8 @@ From previous `{target}` version `{prev}` there have been the following changes. **One package per new version shown.** +Visit [bazzite.gg](https://bazzite.gg) for more information and to download Bazzite. + ### Major packages | Name | Version | | --- | --- | @@ -57,6 +59,8 @@ {changes} """ +HANDWRITTEN_PLACEHOLDER = """\ +This is an automatically generated changelog for release `{curr}`.""" BLACKLIST_VERSIONS = [ "kernel", @@ -335,9 +339,10 @@ def generate_changelog( changelog = CHANGELOG_FORMAT changelog = ( - changelog.replace("{handwritten}\n", handwritten + "\n" if handwritten else "") + changelog.replace("{handwritten}", handwritten if handwritten else HANDWRITTEN_PLACEHOLDER) .replace("{target}", target) .replace("{prev}", prev) + .replace("{curr}", curr) ) for pkg, v in versions.items(): diff --git a/.github/workflows/generate_release.yml b/.github/workflows/generate_release.yml index 90c6efc7c9..30374cdbd7 100644 --- a/.github/workflows/generate_release.yml +++ b/.github/workflows/generate_release.yml @@ -2,9 +2,10 @@ on: workflow_call: workflow_dispatch: inputs: + handwritten: + description: 'Small changelog about changes in this build:' target: description: 'Release Branch (e.g., testing). Defaults to branch name.' - permissions: contents: write @@ -28,7 +29,7 @@ jobs: run: | python3 ./.github/workflows/changelog.py \ "${{ steps.get-target.outputs.target }}" \ - ./output.env ./changelog.md --workdir . + ./output.env ./changelog.md --workdir . --handwritten "${{ github.event.inputs.handwritten }}" source ./output.env echo "title=${TITLE}" >> $GITHUB_OUTPUT echo "tag=${TAG}" >> $GITHUB_OUTPUT