Skip to content

Commit

Permalink
Merge remote-tracking branch 'structure-local/py-ci-cli' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rpatterson committed Oct 31, 2023
2 parents 1622c49 + de7d2b3 commit 655390c
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -876,14 +876,16 @@ ifeq ($(RELEASE_PUBLISH),true)
# Bump the version and build the final release packages:
$(MAKE) -e build-pkgs
# https://twine.readthedocs.io/en/latest/#using-twine
$(TOX_EXEC_BUILD_ARGS) -- twine check ./.tox/.pkg/tmp/dist/*
$(TOX_EXEC_BUILD_ARGS) -- twine check \
./var-docker/$(PYTHON_ENV)/.tox/.pkg/tmp/dist/*
# Ensure VCS has captured all the effects of building the release:
$(MAKE) -e test-clean
$(TOX_EXEC_BUILD_ARGS) -- twine upload -s -r "$(PYPI_REPO)" \
./.tox/.pkg/tmp/dist/*
./var-docker/$(PYTHON_ENV)/.tox/.pkg/tmp/dist/*
export VERSION=$$($(TOX_EXEC_BUILD_ARGS) -qq -- cz version --project)
# Create a GitLab release:
./.tox/build/bin/twine upload -s -r "gitlab" ./.tox/.pkg/tmp/dist/*
./.tox/build/bin/twine upload -s -r "gitlab" \
./var-docker/$(PYTHON_ENV)/.tox/.pkg/tmp/dist/*
release_cli_args="--description ./NEWS-VERSION.rst"
release_cli_args+=" --tag-name v$${VERSION}"
release_cli_args+=" --assets-link {\
Expand All @@ -907,7 +909,8 @@ ifeq ($(RELEASE_PUBLISH),true)
create $${release_cli_args}
# Create a GitHub release
gh release create "v$${VERSION}" $(GITHUB_RELEASE_ARGS) \
--notes-file "./NEWS-VERSION.rst" ./.tox/.pkg/tmp/dist/*
--notes-file "./NEWS-VERSION.rst" \
./var-docker/$(PYTHON_ENV)/.tox/.pkg/tmp/dist/*
endif

.PHONY: release-docker
Expand Down

0 comments on commit 655390c

Please sign in to comment.