Skip to content

Improve rc-cutting process #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wohali merged 1 commit into from
Oct 26, 2017
Merged

Improve rc-cutting process #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include version.mk

REBAR?=$(shell echo `pwd`/bin/rebar)
IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi)
COUCHDB_VERSION_SUFFIX = $(shell if [ ! -z "$(COUCH_RC)" ]; then echo '-RC$(COUCH_RC)'; else if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi; fi)
COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)

DESTDIR=
Expand Down Expand Up @@ -354,21 +354,6 @@ uninstall:
@rm -rf $(DESTDIR)/$(html_dir)
@rm -rf $(DESTDIR)/$(man_dir)

.PHONY: rc
rc:
ifeq ($(strip $(COUCH_RC)),)
@echo "COUCH_RC environment variable not set. Run as 'COUCH_RC=X make rc'"
else
@rm -rf apache-couchdb-*
@$(MAKE) dist 2>&1 > /dev/null
@rm apache-couchdb-*.tar.gz
@mv apache-couchdb-* apache-couchdb-2.1.0-RC$(COUCH_RC)
@tar czf apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz apache-couchdb-2.1.0-RC$(COUCH_RC)
@echo "Done apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz"
@echo "Here is the list of commits since the last RC"
@git log --left-right --graph --cherry-pick --oneline 2.1.0-RC$(shell echo $(COUCH_RC)-1 | bc)...master
@echo "Done!"
endif

################################################################################
# Misc
Expand Down
2 changes: 1 addition & 1 deletion rel/reltool.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

{sys, [
{lib_dirs, ["../src"]},
{rel, "couchdb", "2.1.0", [
{rel, "couchdb", "2.1.1", [
%% stdlib
asn1,
compiler,
Expand Down
2 changes: 1 addition & 1 deletion version.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
vsn_major=2
vsn_minor=1
vsn_patch=0
vsn_patch=1