From f5f186addf63fbbaaecc9df0c761e903eac7523d Mon Sep 17 00:00:00 2001 From: Chisel Date: Sun, 27 Aug 2023 21:59:02 +0100 Subject: [PATCH] fix: use outputs.last-change-version-v instead of outputs.last-change-version ... in most places, and add a comment in the exception. This explains our lack of triggering the github release workflow. --- .github/workflows/changeset-release.yml | 4 ++-- .github/workflows/github-release.yml | 6 +++--- .github/workflows/update-doc-version.yml | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/changeset-release.yml b/.github/workflows/changeset-release.yml index 2db64c75..e0f65d2f 100644 --- a/.github/workflows/changeset-release.yml +++ b/.github/workflows/changeset-release.yml @@ -53,7 +53,7 @@ jobs: shell: bash run: | set -x - TAG_NAME=${{ steps.get-changelog-info.outputs.last-change-version }} + TAG_NAME=${{ steps.get-changelog-info.outputs.last-change-version-v }} if git tag -l | grep -q "^${TAG_NAME}$"; then echo "Tag ${TAG_NAME} already exists" else @@ -65,7 +65,7 @@ jobs: if: steps.changesets.outputs.hasChangesets == 'false' shell: bash run: | - TAG_NAME=${{ steps.get-changelog-info.outputs.last-change-version }} + TAG_NAME=${{ steps.get-changelog-info.outputs.last-change-version-v }} # try not to recreate the tag if git tag -l | grep -q "^${TAG_NAME}$"; then echo "Tag ${TAG_NAME} already exists" diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index f70482c3..6f9eabc2 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -29,7 +29,7 @@ jobs: ## Last Change Entry ```markdown - ${{ steps.get-changelog-entry.outputs.last-change-entry }} + ${{ steps.get-changelog-entry.outputs.last-change-entry-v }} ``` EOInfo @@ -39,7 +39,7 @@ jobs: if: steps.get-changelog-entry.outputs.last-change-entry != '' with: body: ${{ steps.get-changelog-entry.outputs.last-change-entry }} - tag_name: ${{ steps.get-changelog-entry.outputs.last-change-version }} - name: ${{ steps.get-changelog-entry.outputs.last-change-version }} + tag_name: ${{ steps.get-changelog-entry.outputs.last-change-version-v }} + name: ${{ steps.get-changelog-entry.outputs.last-change-version-v }} draft: false prerelease: false diff --git a/.github/workflows/update-doc-version.yml b/.github/workflows/update-doc-version.yml index 6a3b094b..3598b5a1 100644 --- a/.github/workflows/update-doc-version.yml +++ b/.github/workflows/update-doc-version.yml @@ -45,6 +45,8 @@ jobs: shell: bash # yamllint disable rule:line-length run: | + # some files are the version without the v, so we do actually need to + # use outputs.last-change-version here export current_version="${{ steps.get-changelog-info.outputs.last-change-version }}" bumpversion --verbose \ --allow-dirty \ @@ -80,7 +82,7 @@ jobs: with: # yamllint disable rule:line-length title: 'chore: update version in files (${{ steps.get-changelog-info.outputs.last-change-version}})' - commit-message: 'chore: update version in files (${{ steps.get-changelog-info.outputs.last-change-version}}) [skip ci]' + commit-message: 'chore: update version in files (${{ steps.get-changelog-info.outputs.last-change-version}})\n\n[skip ci]' base: ${{ github.event.repository.default_branch }} delete-branch: true token: ${{ secrets.CHANGESETS_TOKEN }}