From 87a2e0272106b612896126664636dc933e28d85e Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 8 Mar 2017 13:22:19 +0100 Subject: [PATCH] Make more apparent what happens with `make release` Instead of getting (deleted and untracked files): ``` $ git status # On branch master # Your branch is ahead of 'origin/master' by 20 commits. # # Changes not staged for commit: # (use "git add/rm ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # deleted: cdb_dataservices_server--0.20.0--0.21.0.sql # deleted: cdb_dataservices_server--0.21.0--0.20.0.sql # deleted: cdb_dataservices_server--0.21.0.sql # modified: cdb_dataservices_server.control # # Untracked files: # (use "git add ..." to include in what will be committed) # # cdb_dataservices_server--0.21.0--0.22.0.sql # cdb_dataservices_server--0.22.0--0.21.0.sql # cdb_dataservices_server--0.22.0.sql # old_versions/cdb_dataservices_server--0.20.0--0.21.0.sql # old_versions/cdb_dataservices_server--0.21.0--0.20.0.sql # old_versions/cdb_dataservices_server--0.21.0.sql no changes added to commit (use "git add" and/or "git commit -a") ``` you'd get something like: ``` $ git status # On branch master # Your branch is ahead of 'origin/master' by 20 commits. # # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # renamed: cdb_dataservices_server--0.20.0--0.21.0.sql -> old_versions/cdb_dataservices_server--0.20.0--0.21.0.sql # renamed: cdb_dataservices_server--0.21.0--0.20.0.sql -> old_versions/cdb_dataservices_server--0.21.0--0.20.0.sql # renamed: cdb_dataservices_server--0.21.0.sql -> old_versions/cdb_dataservices_server--0.21.0.sql # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: cdb_dataservices_server.control # # Untracked files: # (use "git add ..." to include in what will be committed) # # cdb_dataservices_server--0.21.0--0.22.0.sql # cdb_dataservices_server--0.22.0--0.21.0.sql # cdb_dataservices_server--0.22.0.sql ``` which is nicer IMHO. --- server/extension/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/extension/Makefile b/server/extension/Makefile index bb98dc2..090210f 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -38,7 +38,7 @@ all: $(DATA) .PHONY: release release: $(EXTENSION).control $(SOURCES_DATA) test -n "$(NEW_VERSION)" # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0 - mv *.sql old_versions + git mv *.sql old_versions $(SED) $(REPLACEMENTS) $(EXTENSION).control cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql $(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql