Skip to content

Commit ff6ab0d

Browse files
authored
Merge pull request #78 from Learnosity/LRN-42450/bug/fix-makefile-dist-check-version
[BUG] Fix dist-check-version in the makefile - LRN-42450
2 parents 6f2d091 + ad94496 commit ff6ab0d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ dist: distclean venv pip-requirements-dev
7272
$(PYTHON) setup.py sdist; \
7373
$(PYTHON) setup.py bdist_wheel --universal
7474
dist-upload: dist-check-version clean test dist-upload-twine
75-
dist-check-version: PKG_VER=v$(shell sed -n "s/^.*__version__\s*=\s*'\([^']\+\)'.*$$/\1/p" learnosity_sdk/_version.py)
75+
dist-check-version: PKG_VER=$(shell sed -n "s/^.*__version__\s*=\s*'\([^']\+\)'.*$$/\1/p" learnosity_sdk/_version.py)
7676
dist-check-version: GIT_TAG=$(shell git describe --tags)
7777
dist-check-version:
78-
ifeq ('$(shell echo $(GIT_TAG) | grep -qw "$(PKG_VER)")', '')
78+
ifeq ($(shell echo $(GIT_TAG) | grep -qw "$(PKG_VER)"; echo $$?),1)
7979
$(error Version number $(PKG_VER) in learnosity_sdk/_version.py does not match git tag $(GIT_TAG))
8080
endif
8181
dist-upload-twine: venv pip-requirements-dev dist # This target doesn't do any safety check!

0 commit comments

Comments
 (0)