Fix third Codex finding: make version hardcoded a non-portable remote name
git push fork v\$(VERSION) only works on this maintainer's own machine, where "fork" happens to be configured (and where "origin" still means the stale upstream, from how this repo was originally forked). A plain clone via the README's own instructions only ever creates "origin", pointing at dillardblom/occweb - so make version would tag locally, then fail at the push step before packaging/signing ever ran. Made the target remote configurable via RELEASE_REMOTE, defaulting to "origin" (correct for a normal clone), overridable for this specific checkout's non-standard remote layout.
This commit is contained in:
@@ -150,11 +150,18 @@ VERSION := $(shell xpath -q -e "//info/version/text()" appinfo/info.xml)
|
|||||||
show-version:
|
show-version:
|
||||||
@echo $(VERSION)
|
@echo $(VERSION)
|
||||||
|
|
||||||
|
# Defaults to "origin" - correct for a plain clone of this repo, where
|
||||||
|
# "origin" is dillardblom/occweb. Override for a checkout where "origin"
|
||||||
|
# means something else (e.g. this maintainer's own machine, where the repo
|
||||||
|
# was originally forked from upstream and "origin" still points there):
|
||||||
|
# make version RELEASE_REMOTE=fork
|
||||||
|
RELEASE_REMOTE ?= origin
|
||||||
|
|
||||||
.PHONY: version
|
.PHONY: version
|
||||||
version:
|
version:
|
||||||
@echo "Creating version v$(VERSION)"
|
@echo "Creating version v$(VERSION)"
|
||||||
@git tag v$(VERSION)
|
@git tag v$(VERSION)
|
||||||
@git push fork v$(VERSION)
|
@git push $(RELEASE_REMOTE) v$(VERSION)
|
||||||
@make dist
|
@make dist
|
||||||
@echo "\nRelease Signature: \n"
|
@echo "\nRelease Signature: \n"
|
||||||
@make sign
|
@make sign
|
||||||
|
|||||||
Reference in New Issue
Block a user