Skip to content

Commit 5ba2dd5

Browse files
author
Luke Bakken
committed
restore git tagging
1 parent cf965ab commit 5ba2dd5

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ PANDOC_VERSION := $(shell pandoc --version)
1616
PROTOC_VERSION := $(shell protoc --version)
1717

1818
PROJDIR = $(realpath $(CURDIR))
19-
TOOLS_DIR = $(PROJDIR)/tools/devrel
20-
CA_DIR = $(PROJDIR)/tools/test-ca
2119

2220
PYPI_REPOSITORY ?= pypi
2321

2422
.PHONY: lint
2523
lint:
26-
./.runner lint
24+
$(PROJDIR)/.runner lint
2725

2826
.PHONY: pb_clean
2927
pb_clean:
@@ -59,14 +57,16 @@ ifeq ($(RELEASE_GPG_KEYNAME),)
5957
endif
6058
@python -c 'import pypandoc'
6159
@echo "==> Python tagging version $(VERSION)"
62-
@./build/publish $(VERSION) validate
60+
@$(PROJDIR)/build/publish $(VERSION) validate
61+
@git tag --sign -a "$(VERSION)" -m "riak-python-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
62+
@git push --tags
6363
@echo "==> pypi repository: $(PYPI_REPOSITORY)"
6464
@echo "==> Python (sdist)"
6565
@python setup.py sdist upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
66-
@./build/publish $(VERSION)
66+
@$(PROJDIR)/build/publish $(VERSION)
6767

6868
.PHONY: release
69-
release: release_sdist
69+
release: # release_sdist
7070
ifeq ($(RELEASE_GPG_KEYNAME),)
7171
$(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package)
7272
endif
@@ -82,19 +82,19 @@ endif
8282

8383
.PHONY: unit-test
8484
unit-test:
85-
@./.runner unit-test
85+
@$(PROJDIR)/runner unit-test
8686

8787
.PHONY: integration-test
8888
integration-test:
89-
@./.runner integration-test
89+
@$(PROJDIR)/runner integration-test
9090

9191
.PHONY: security-test
9292
security-test:
93-
@./.runner security-test
93+
@$(PROJDIR)/runner security-test
9494

9595
.PHONY: timeseries-test
9696
timeseries-test:
97-
@./.runner timeseries-test
97+
@$(PROJDIR)/runner timeseries-test
9898

9999
.PHONY: test
100100
test: integration-test

0 commit comments

Comments
 (0)