diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py index 095dd739b9..da45be6a8b 100755 --- a/.ci/scripts/check_release.py +++ b/.ci/scripts/check_release.py @@ -37,7 +37,10 @@ def template_config(): def current_version(repo, commitish): try: pyproject_toml = tomllib.loads(repo.git.show(f"{commitish}:pyproject.toml")) - current_version = pyproject_toml["project"]["version"] + try: + current_version = pyproject_toml["project"]["version"] + except Exception: + current_version = pyproject_toml["tool"]["bumpversion"]["current_version"] except Exception: current_version = repo.git.grep( "current_version", commitish, "--", ".bumpversion.cfg" diff --git a/.github/template_gitref b/.github/template_gitref index 8156a7ac11..050a3ebcc8 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-399-g78ad960 +2021.08.26-402-g0bc33a6 diff --git a/.github/workflows/scripts/publish_plugin_pypi.sh b/.github/workflows/scripts/publish_plugin_pypi.sh index 1105b289f7..44f8b38050 100755 --- a/.github/workflows/scripts/publish_plugin_pypi.sh +++ b/.github/workflows/scripts/publish_plugin_pypi.sh @@ -28,6 +28,6 @@ then fi twine upload -u __token__ -p "$PYPI_API_TOKEN" \ -"dist/pulpcore-$VERSION-py3-none-any.whl" \ -"dist/pulpcore-$VERSION.tar.gz" \ +dist/pulpcore-"$VERSION"-py3-none-any.whl \ +dist/pulpcore-"$VERSION".tar.gz \ ;