From b44778c5864f4f65430ab9c83935ba902ce23dc4 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Tue, 28 Nov 2017 16:03:03 +0100 Subject: [PATCH] PG release: Include all files in git upon release --- client/Makefile | 3 ++- server/extension/Makefile | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index 3fbd4cb..85a9985 100644 --- a/client/Makefile +++ b/client/Makefile @@ -73,9 +73,10 @@ release: $(EXTENSION).control $(SOURCES_DATA) $(SED) $(REPLACEMENTS) $(EXTENSION).control git add $(EXTENSION).control cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql - git add $(EXTENSION)--$(NEW_VERSION).sql $(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql $(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql + cat $(EXTENSION)--$(NEW_VERSION).sql >> $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql + git add $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql $(EXTENSION)--$(NEW_VERSION).sql # Only meant for development time, do not use once a version is released .PHONY: devclean diff --git a/server/extension/Makefile b/server/extension/Makefile index f933a73..1d2dd32 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -52,9 +52,12 @@ release: $(EXTENSION).control $(SOURCES_DATA) test -n "$(NEW_VERSION)" # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0 git mv *.sql old_versions $(SED) $(REPLACEMENTS) $(EXTENSION).control + git add $(EXTENSION).control cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql $(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql $(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql + cat $(EXTENSION)--$(NEW_VERSION).sql >> $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql + git add $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql $(EXTENSION)--$(NEW_VERSION).sql # Only meant for development time, do not use once a version is released .PHONY: devclean