Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[BUG] Fix dist-check-version in the makefile - LRN-42450
  • Loading branch information
walsh-conor committed Aug 2, 2024
commit ad9449606d3667c7e9a94ab0cb8228baf7dd83ac
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ dist: distclean venv pip-requirements-dev
$(PYTHON) setup.py sdist; \
$(PYTHON) setup.py bdist_wheel --universal
dist-upload: dist-check-version clean test dist-upload-twine
dist-check-version: PKG_VER=v$(shell sed -n "s/^.*__version__\s*=\s*'\([^']\+\)'.*$$/\1/p" learnosity_sdk/_version.py)
dist-check-version: PKG_VER=$(shell sed -n "s/^.*__version__\s*=\s*'\([^']\+\)'.*$$/\1/p" learnosity_sdk/_version.py)
dist-check-version: GIT_TAG=$(shell git describe --tags)
dist-check-version:
ifeq ('$(shell echo $(GIT_TAG) | grep -qw "$(PKG_VER)")', '')
ifeq ($(shell echo $(GIT_TAG) | grep -qw "$(PKG_VER)"; echo $$?),1)
$(error Version number $(PKG_VER) in learnosity_sdk/_version.py does not match git tag $(GIT_TAG))
endif
dist-upload-twine: venv pip-requirements-dev dist # This target doesn't do any safety check!
Expand Down