Skip to content
Permalink
Browse files
Some incremental improvements
  • Loading branch information
Noah Slater committed Mar 7, 2013
1 parent 4007779 commit 462dc2bdab7a8e23ae19e4ed6752f709062a9cb8
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 18 deletions.
@@ -20,7 +20,7 @@

GIT_URL=https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=blob_plain;

EMAIL_TPL=email/discuss_release.txt
EMAIL_TPL=discuss_release.txt

if test -n "$1"; then
cache_dir=$1
@@ -104,4 +104,4 @@ echo "Email text written to:" $email_file

echo "Send the email to: dev@couchdb.apache.org"

echo "Files in $tmp_dir"
echo "Files in: $tmp_dir"
@@ -0,0 +1,19 @@
Subject: [RESULT] (Was: [VOTE] Release Apache CouchDB %VERSION%-rc.%CANDIDATE%)

Dear community,

The final tally of the vote is:

%TALLY%

This is a successful majority approval, and the vote passes.

I shall prepare the release as soon as possible.

The individual votes are as follows:

%INDIVIDUAL_VOTES%

Thanks,

%VOTE_THREAD%
@@ -79,7 +79,7 @@ cat > $diff_file <<EOF
^Only in $tmp_dir/apache-couchdb-1.3.0/src/couchdb/priv: couchjs.1\$
EOF

build_file=build.mk
build_file=$tmp_dir/build.mk

cat > $build_file <<EOF
URL=https://git-wip-us.apache.org/repos/asf/couchdb.git
@@ -166,4 +166,4 @@ make -f $build_file check

log "Check complete..."

echo "Files in $tmp_dir"
echo "Files in: $tmp_dir"
@@ -112,4 +112,4 @@ scp -i $identity_file $connection:$tgz_file $tmp_dir

scp -i $identity_file $connection:$ish_file $tmp_dir

echo "Files in $tmp_dir"
echo "Files in: $tmp_dir"
@@ -135,3 +135,6 @@ done
for version in $versions; do
scan $version
done

echo "Files in: $tmp_dir"

@@ -18,7 +18,7 @@
#
# cf. http://wiki.apache.org/couchdb/Release_Procedure

EMAIL_TPL=email/vote_release.txt
EMAIL_TPL=../email/vote_release.txt

if test -n "$1"; then
candidate_dir=$1
@@ -66,6 +66,8 @@ TMP_DIR=$tmp_dir
SVN_DIR=\$(TMP_DIR)/svn
SVN_DOT_DIR=\$(TMP_DIR)/.svn
EMAIL_TPL=$EMAIL_TPL
EMAIL_FILE=\$(TMP_DIR)/email.txt
@@ -90,17 +92,19 @@ COMMIT_MSG_FILES="Add \$(VERSION) rc.\$(CANDIDATE) files"
GPG=gpg --armor --detach-sig \$(GPG_ARGS)
SVN=svn --config-dir \$(SVN_DOT_DIR) --no-auth-cache
all: checkin
checkin: sign
cd \$(SVN_DIR) && svn add \$(SVN_TGZ_FILE)
cd \$(SVN_DIR) && svn add \$(SVN_TGZ_FILE).asc
cd \$(SVN_DIR) && svn add \$(SVN_TGZ_FILE).ish
cd \$(SVN_DIR) && svn add \$(SVN_TGZ_FILE).md5
cd \$(SVN_DIR) && svn add \$(SVN_TGZ_FILE).sha
cd \$(SVN_DIR) && svn status
cd \$(SVN_DIR) && \$(SVN) add \$(SVN_TGZ_FILE)
cd \$(SVN_DIR) && \$(SVN) add \$(SVN_TGZ_FILE).asc
cd \$(SVN_DIR) && \$(SVN) add \$(SVN_TGZ_FILE).ish
cd \$(SVN_DIR) && \$(SVN) add \$(SVN_TGZ_FILE).md5
cd \$(SVN_DIR) && \$(SVN) add \$(SVN_TGZ_FILE).sha
cd \$(SVN_DIR) && \$(SVN) status
sleep 10
cd \$(SVN_DIR) && svn ci -m \$(COMMIT_MSG_FILES)
cd \$(SVN_DIR) && \$(SVN) ci -m \$(COMMIT_MSG_FILES)
sign: copy
\$(GPG) < \$(SVN_TGZ_FILE) > \$(SVN_TGZ_FILE).asc
@@ -115,13 +119,15 @@ check: \$(SVN_DIR)
test -s \$(CANDIDATE_TGZ_FILE)
test -s \$(CANDIDATE_TGZ_FILE).ish
\$(SVN_DIR):
svn mkdir --parents \$(CANDIDATE_URL) -m \$(COMMIT_MSG_DIR)
\$(SVN_DIR): \$(SVN_DOT_DIR)
\$(SVN) mkdir --parents \$(CANDIDATE_URL) -m \$(COMMIT_MSG_DIR)
sleep 10
svn co \$(CANDIDATE_URL) \$@
\$(SVN) co \$(CANDIDATE_URL) \$@
\$(SVN_DOT_DIR):
mkdir \$@
email: \$(EMAIL_FILE)
cat \$(EMAIL_FILE)
\$(EMAIL_FILE): \$(EMAIL_TPL)
sed -e "s|%VERSION%|\$(VERSION)|g" \
@@ -145,4 +151,4 @@ echo "Email text written to:" $email_file

echo "Send the email to: dev@couchdb.apache.org"

echo "Files in $tmp_dir"
echo "Files in: $tmp_dir"

0 comments on commit 462dc2b

Please sign in to comment.