Skip to content

Commit

Permalink
Merge pull request cms-sw#20 from stuartw/patch/buildrelease/github
Browse files Browse the repository at this point in the history
Fix broken buildrelease script
  • Loading branch information
Stephen Foulkes committed Jul 16, 2012
2 parents cabce3a + 282f00b commit 69e670f
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions bin/buildrelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ echo "Building new release of WMCore $VERSION on ${GITBRANCH}"

if ! echo ${GITBRANCH} | egrep -iq 'master|wmcore_' ; then
echo "ABORTING - Can only release from master or a WMCORE_X_Y_Z git checkout: ${GITBRANCH}"
exit 5
fi

if ! echo ${GITBRANCH} | egrep -iq 'master|wmcore_' ; then
echo "ABORTING - Can only release from master or a wmcore_X_Y_Z branch: ${BRANCH}"
exit 4
fi

Expand All @@ -66,8 +61,7 @@ if [ X$(git rev-parse --show-toplevel) != X$PWD ]; then
fi

# Check if tag exists
git show-ref --verify --quiet -- "refs/tags/${VERSION}"
if [ $? -eq 0 ]; then
if git show-ref --verify --quiet -- "refs/tags/${VERSION}"; then
echo "Tag $VERSION exists, skipping tag command"
TAG=false
fi
Expand Down

0 comments on commit 69e670f

Please sign in to comment.