diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b7763d..0c01f27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,10 +73,13 @@ jobs: - name: Upload to PyPI run: | twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} --skip-existing + this_tag=$(python -c "import eos;print('v'+eos.__version__)") + echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV - name: Update Release if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: + tag_name: ${{ env.RELEASE_TAG }} files: |- dist/amor*.tar.gz @@ -115,9 +118,9 @@ jobs: - uses: actions/checkout@v4 - name: get latest version tag and release note run: | - this_tag=$(git describe --abbrev=0 --tags) + this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) - commit_messages==$'Commits since previous release: \n\n'$(git log $this_tag..$prev_tag --pretty=format:"* %s") + commit_messages==$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - name: Create Release