Skip to content

Commit

Permalink
fix: use outputs.last-change-version-v instead of outputs.last-change…
Browse files Browse the repository at this point in the history
…-version

... in most places, and add a comment in the exception.

This explains our lack of triggering the github release workflow.
  • Loading branch information
chizmw committed Aug 27, 2023
1 parent a67c2a3 commit f5f186a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/changeset-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion .github/workflows/update-doc-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 }}
Expand Down

0 comments on commit f5f186a

Please sign in to comment.