This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit 308fd080e9a81aed252660f75334a4e138b5ed02 Author: Dave Brondsema <[email protected]> AuthorDate: Wed May 12 16:48:40 2021 -0400 release script: fix for some return codes --- scripts/asf-release.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh index 6176e1d..2c282fb 100755 --- a/scripts/asf-release.sh +++ b/scripts/asf-release.sh @@ -49,17 +49,16 @@ CLOSE_DATE=`date -d '+72 hours' -R --utc | sed -e 's/+0000/UTC/'` YEAR=`date +%Y` sed -i -e "s/2012-[0-9]\{4\} /2012-$YEAR /" NOTICE */NOTICE */docs/conf.py -git commit -m "Update copyright year" NOTICE */NOTICE */docs/conf.py +git commit -m "Update copyright year" NOTICE */NOTICE */docs/conf.py || echo "no copyright year changes to commit" scripts/changelog.py rel/$PREV_VERSION HEAD $VERSION > .changelog.tmp echo >> .changelog.tmp cat CHANGES >> .changelog.tmp mv -f .changelog.tmp CHANGES prompt DUMMY "CHANGES file populated, please edit it to summarize, write upgrade notes etc. Press enter when ready to commit" "enter" -git add CHANGES -git commit -m "CHANGES updated for ASF release $VERSION" +git commit -m "CHANGES updated for ASF release $VERSION" CHANGES -DEFAULT_KEY=`grep ^default-key ~/.gnupg/gpg.conf | sed -e 's/default-key //'` +DEFAULT_KEY=`grep ^default-key ~/.gnupg/gpg.conf | sed -e 's/default-key //'` || true # ok if doesn't exit ok if [[ -z "$DEFAULT_KEY" ]]; then DEFAULT_KEY=`gpg --list-secret-keys | egrep '[0-9A-F]{8}' | head -1 | sed -e 's/\W//g'` fi
