build/pre-release: fail if builds are identical

taye · taye · commit c5f658e60217 · 2017-07-07T14:25:00.000+02:00
diff --git a/build/pre-release.sh b/build/pre-release.sh
@@ -2,12 +2,12 @@
 git clean -fx dist/*
 git diff-index HEAD --stat --exit-code || exit $?
 
-INITIAL_REV=$(git rev-parse --abbrev-ref HEAD)
+INITIAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
 echo 'checking out the "unstable" branch'
 git checkout unstable || exit $?
 
-git merge --no-ff --no-edit $INITIAL_REV || exit $?
+git merge --no-ff --no-edit $INITIAL_BRANCH || exit $?
 
 # preversion tests must pass
 npm run preversion || exit $?
@@ -16,22 +16,28 @@ npm run preversion || exit $?
 NEW_VERSION=$(node build/bump prerelease)
 NEW_TAG=$(echo "v$NEW_VERSION" | sed 's/[+].*//')
 
-npm run build &&
-  git commit -m "v$NEW_VERSION" -- package.json dist || exit $?
+#if the version tag already exists, reset head to previous commit and exit
+if [ git cat-file -e $NEW_TAG ]; then
+  exit 1
+fi
 
-# add new version tag
-if git tag $NEW_TAG; then
-  # push branch and tags to git origin and publish to npm
-  git tag --force next &&
-    git push &&
-    git push origin $NEW_TAG next &&
-    npm publish --tag next
-else
-  #if the version tag already exists, reset head to previous commit and exit
-  err=$?
-  git reset HEAD@{1}
-  exit $err
+npm run build || exit $?
+
+if [ ! git diff --quiet next ]; then
+  echo files of this build and the existing "next" tag are identical
+  exit 1
 fi
 
+
+git commit -m "v$NEW_VERSION" -- package.json dist || exit $?
+
+# add new version tag
+git tag $NEW_TAG
+# push branch and tags to git origin and publish to npm
+git tag --force next &&
+  git push &&
+  git push origin $NEW_TAG next &&
+  npm publish --tag next
+
 # leave the "unstable" branch
-git checkout $INITIAI_REV
+git checkout $INITIAL_BRANCH
