diff --git a/.github/workflows/chore-version-bump.yaml b/.github/workflows/chore-version-bump.yaml index cb5e2a41..ecd4ad3d 100644 --- a/.github/workflows/chore-version-bump.yaml +++ b/.github/workflows/chore-version-bump.yaml @@ -38,13 +38,17 @@ jobs: next_version="${major}.${minor}.${next_patch}" sed -i "/^project(/,/^)/ s/${version}/${next_version}/" CMakeLists.txt + + # The nightly recipe reads this version via {debupstream}. + sed -i "1s/(1:[^-]*-/(1:${next_version}-/" pkg/ppa/debian/changelog + echo "NEXT_VERSION=${next_version}" >> $GITHUB_ENV - name: Commit & Push run: | git config user.name "zealdocs-ci[bot]" git config user.email "273095467+zealdocs-ci[bot]@users.noreply.github.com" - git add CMakeLists.txt + git add CMakeLists.txt pkg/ppa/debian/changelog git diff --staged --quiet && echo "::error::Version bump failed, no changes detected." && exit 1 git commit -m "chore: bump version to ${{ env.NEXT_VERSION }}" git push diff --git a/pkg/ppa/debian/changelog b/pkg/ppa/debian/changelog index e68dd661..65ea7696 100644 --- a/pkg/ppa/debian/changelog +++ b/pkg/ppa/debian/changelog @@ -1,8 +1,10 @@ -zeal (1:0.8.2-0ubuntu1) UNRELEASED; urgency=medium +zeal (1:0.9.2-0ubuntu1) UNRELEASED; urgency=medium - * Placeholder entry. The real version and target series are set at upload - time by debian/rules consumers: the release workflow rewrites this with - `dch` per series, and the Launchpad nightly recipe derives the version - from its `deb-version` template. See pkg/ppa/README.md. + * Placeholder entry, except for the version above. Releases rewrite this file + with `dch` per series in publish-ppa.yaml, but the Launchpad nightly recipe + reads that version through `{debupstream}` and appends `-0~{revtime}`. It + must name the next, unreleased version, so a nightly sorts above the last + release and below the next one. Keep it in step with CMakeLists.txt; + chore-version-bump.yaml does that on release. See pkg/ppa/README.md. -- Zeal Release Thu, 01 May 2025 00:00:00 +0000