Merge branch 'main' into chore/version-bump-0.14.0

derkweijers · Feb 29, 2024 · 44338de · 44338de
2 parents a29566d + 70158b2
commit 44338de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,7 +3,6 @@ on:
  pull_request:
  types:
  - closed
-
 jobs:
  release:
  runs-on: ubuntu-latest
@@ -24,6 +23,10 @@ jobs:
 
  - name: Install Poetry
  run: pip install poetry
+
+ - name: read the version from pyproject.toml
+ id: read_version
+ run: echo VERSION=$(poetry version -s) >> "$GITHUB_OUTPUT"
 
  - name: Build and publish
  run: |
@@ -32,6 +35,6 @@ jobs:
  # poetry publish --build --no-interaction
 
  - name: Create a release on GitHub
- run: gh release create ${{ steps.bump_version.outputs.VERSION }} dist/* --title "Release ${{ steps.bump_version.outputs.VERSION }}" --notes "Release ${{ steps.bump_version.outputs.VERSION }}"
+ run: gh release create ${{ steps.read_version.outputs.VERSION }} dist/* --title "Release ${{ steps.read_version.outputs.VERSION }}" --notes "Release ${{ steps.read_version.outputs.VERSION }}"
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/setup-release.yaml b/.github/workflows/setup-release.yaml
@@ -50,6 +50,6 @@ jobs:
 
  # Create a PR for the new version since we don't want to push directly to main
  - name: create pull request
- run: gh pr create -B main -H "chore/version-bump-${{ steps.bump_version.outputs.VERSION }}" --title 'Bump the version to ${{ steps.bump_version.outputs.VERSION }}' --body 'Created by the `Release` Github action'
+ run: gh pr create -B main -H "chore/version-bump-${{ steps.bump_version.outputs.VERSION }}" --title 'Bump the version to ${{ steps.bump_version.outputs.VERSION }}' --body 'Created by the `Setup Release` Github action'
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}