From b5c0e135f922121b9afeb93ba81e951be57bcae8 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Thu, 30 Nov 2017 12:19:11 +0100 Subject: [PATCH] Revert "PG release: Include all files in git upon release" This reverts commit b44778c5864f4f65430ab9c83935ba902ce23dc4. --- client/Makefile | 3 +-- server/extension/Makefile | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/client/Makefile b/client/Makefile index 85a9985..3fbd4cb 100644 --- a/client/Makefile +++ b/client/Makefile @@ -73,10 +73,9 @@ 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 1d2dd32..f933a73 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -52,12 +52,9 @@ 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