From 98dc5ab0e104d9649dd0527965b2642932053874 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2026 01:42:55 +0000 Subject: [PATCH 1/2] Bump TriPSs/conventional-changelog-action from 5.4.0 to 6.4.0 Bumps [TriPSs/conventional-changelog-action](https://github.com/tripss/conventional-changelog-action) from 5.4.0 to 6.4.0. - [Release notes](https://github.com/tripss/conventional-changelog-action/releases) - [Changelog](https://github.com/TriPSs/conventional-changelog-action/blob/releases/v6/CHANGELOG.md) - [Commits](https://github.com/tripss/conventional-changelog-action/compare/v5.4.0...v6.4.0) --- updated-dependencies: - dependency-name: TriPSs/conventional-changelog-action dependency-version: 6.4.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/complete-artifact-matrix-all-stable.yml | 2 +- .github/workflows/complete-artifact-matrix-all.yml | 2 +- .github/workflows/complete-artifact-matrix-apps.yml | 2 +- .../workflows/complete-artifact-matrix-community-maintained.yml | 2 +- .github/workflows/complete-artifact-matrix-nightly.yml | 2 +- .github/workflows/complete-artifact-matrix-standard-support.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/complete-artifact-matrix-all-stable.yml b/.github/workflows/complete-artifact-matrix-all-stable.yml index 982e13d95f5..366a9ad988a 100644 --- a/.github/workflows/complete-artifact-matrix-all-stable.yml +++ b/.github/workflows/complete-artifact-matrix-all-stable.yml @@ -283,7 +283,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' diff --git a/.github/workflows/complete-artifact-matrix-all.yml b/.github/workflows/complete-artifact-matrix-all.yml index b3d1d55c567..75569ef85e9 100644 --- a/.github/workflows/complete-artifact-matrix-all.yml +++ b/.github/workflows/complete-artifact-matrix-all.yml @@ -284,7 +284,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' diff --git a/.github/workflows/complete-artifact-matrix-apps.yml b/.github/workflows/complete-artifact-matrix-apps.yml index 794248650fc..91a1e4b5d51 100644 --- a/.github/workflows/complete-artifact-matrix-apps.yml +++ b/.github/workflows/complete-artifact-matrix-apps.yml @@ -638,7 +638,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' diff --git a/.github/workflows/complete-artifact-matrix-community-maintained.yml b/.github/workflows/complete-artifact-matrix-community-maintained.yml index cf386ff97d8..e6ba78ddef6 100644 --- a/.github/workflows/complete-artifact-matrix-community-maintained.yml +++ b/.github/workflows/complete-artifact-matrix-community-maintained.yml @@ -640,7 +640,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' diff --git a/.github/workflows/complete-artifact-matrix-nightly.yml b/.github/workflows/complete-artifact-matrix-nightly.yml index 6627a915d62..361cfea8dd7 100644 --- a/.github/workflows/complete-artifact-matrix-nightly.yml +++ b/.github/workflows/complete-artifact-matrix-nightly.yml @@ -644,7 +644,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' diff --git a/.github/workflows/complete-artifact-matrix-standard-support.yml b/.github/workflows/complete-artifact-matrix-standard-support.yml index 64d0625a807..4166a547644 100644 --- a/.github/workflows/complete-artifact-matrix-standard-support.yml +++ b/.github/workflows/complete-artifact-matrix-standard-support.yml @@ -638,7 +638,7 @@ jobs: - name: Bump version if: ${{ ( ! github.event.inputs.versionOverride ) && ( inputs.ref == '' ) && ( env.VERSION_BUMP == 'true' ) }} id: changelog - uses: TriPSs/conventional-changelog-action@v5.4.0 + uses: TriPSs/conventional-changelog-action@v6.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN_ARMBIANWORKER }} git-message: 'Bump release to {version}' From 13d5cdfd554ac978f45fd913eee444e9814d73bd Mon Sep 17 00:00:00 2001 From: Igor Velkov <325961+iav@users.noreply.github.com> Date: Mon, 13 Jul 2026 21:00:28 +0300 Subject: [PATCH 2/2] ci: preserve -trunk.N nightly versioning with changelog-action v6 conventional-changelog-action v6.0.0 changed the pre-release bump from a plain prerelease-counter increment to pre, which advances the nightly base version on every build and resets the -trunk counter. Enable pre-release-smart-bump (added in v6.4.0) so the existing -trunk.N progression is kept for our calendar-driven YY.MM.0 base; only a rare major/breaking commit would move the base, matching prior intent. Assisted-by: Claude:claude-opus-4.8 --- .github/workflows/complete-artifact-matrix-all-stable.yml | 1 + .github/workflows/complete-artifact-matrix-all.yml | 1 + .github/workflows/complete-artifact-matrix-apps.yml | 1 + .../workflows/complete-artifact-matrix-community-maintained.yml | 1 + .github/workflows/complete-artifact-matrix-nightly.yml | 1 + .github/workflows/complete-artifact-matrix-standard-support.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/workflows/complete-artifact-matrix-all-stable.yml b/.github/workflows/complete-artifact-matrix-all-stable.yml index 366a9ad988a..4e5ee10306d 100644 --- a/.github/workflows/complete-artifact-matrix-all-stable.yml +++ b/.github/workflows/complete-artifact-matrix-all-stable.yml @@ -297,6 +297,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk' diff --git a/.github/workflows/complete-artifact-matrix-all.yml b/.github/workflows/complete-artifact-matrix-all.yml index 75569ef85e9..a366246194c 100644 --- a/.github/workflows/complete-artifact-matrix-all.yml +++ b/.github/workflows/complete-artifact-matrix-all.yml @@ -298,6 +298,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk' diff --git a/.github/workflows/complete-artifact-matrix-apps.yml b/.github/workflows/complete-artifact-matrix-apps.yml index 91a1e4b5d51..f12e5e84ac1 100644 --- a/.github/workflows/complete-artifact-matrix-apps.yml +++ b/.github/workflows/complete-artifact-matrix-apps.yml @@ -652,6 +652,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk' diff --git a/.github/workflows/complete-artifact-matrix-community-maintained.yml b/.github/workflows/complete-artifact-matrix-community-maintained.yml index e6ba78ddef6..025bbe4d212 100644 --- a/.github/workflows/complete-artifact-matrix-community-maintained.yml +++ b/.github/workflows/complete-artifact-matrix-community-maintained.yml @@ -654,6 +654,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk' diff --git a/.github/workflows/complete-artifact-matrix-nightly.yml b/.github/workflows/complete-artifact-matrix-nightly.yml index 361cfea8dd7..b221132934d 100644 --- a/.github/workflows/complete-artifact-matrix-nightly.yml +++ b/.github/workflows/complete-artifact-matrix-nightly.yml @@ -658,6 +658,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk' diff --git a/.github/workflows/complete-artifact-matrix-standard-support.yml b/.github/workflows/complete-artifact-matrix-standard-support.yml index 4166a547644..a935a4fe3b7 100644 --- a/.github/workflows/complete-artifact-matrix-standard-support.yml +++ b/.github/workflows/complete-artifact-matrix-standard-support.yml @@ -652,6 +652,7 @@ jobs: skip-tag: "${{ steps.versionfile.outputs.skip_tag }}" version-file: "${{ steps.versionfile.outputs.file }}.json" pre-release: "${{ steps.versionfile.outputs.pre_release }}" + pre-release-smart-bump: 'true' git-branch: 'main' tag-prefix: '' pre-release-identifier: 'trunk'