Update deploy script

JrGoodle · Jun 28, 2020 · 5aac513 · 5aac513
1 parent 37c9f92
commit 5aac513
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/script/deploy b/script/deploy
@@ -28,7 +28,7 @@ TAG="${VERSION}"
 
 popd || exit 1
 
-git fetch --tags
+git fetch --tags || exit 1
 if git rev-list "${TAG}" >/dev/null; then
     echo "${TAG} tag exists. No deployment will be done."
 else
@@ -39,12 +39,6 @@ else
     script/clean all || exit 1
     echo ''
 
-    echo 'Create tag and push to GitHub'
-    echo '-----------------------------'
-    git tag "${TAG}" -a -m "${TAG}"
-    git push origin "${TAG}"
-    echo ''
-
     pushd 'src' || exit 1
     echo ''
 
@@ -58,16 +52,22 @@ else
     sudo -H python3 setup.py bdist_wheel || exit 1
     echo ''
 
-    echo "Creating new tag and GitHub Release"
-    echo '-----------------------------------'
+    echo 'Create tag and push to GitHub'
+    echo '-----------------------------'
+    git tag "${TAG}" -a -m "${TAG}" || exit 1
+    git push origin "${TAG}" || exit 1
+    echo ''
+
+    echo "Create new GitHub Release"
+    echo '-------------------------'
     github-release release \
         --tag "${TAG}" \
         --name "${TAG}" \
         --description "Release ${TAG}" || exit 1
     echo ''
 
-    echo "Uploading artifacts to GitHub Releases"
-    echo '--------------------------------------'
+    echo "Upload artifacts to GitHub Releases"
+    echo '-----------------------------------'
     pushd "dist" || exit 1
     artifacts=( "clowder_repo-${VERSION}-py3-none-any.whl" \
                  "clowder-repo-${VERSION}.tar.gz" )
@@ -82,8 +82,8 @@ else
     popd || exit 1
     echo ''
 
-    echo 'Uploading to PyPI'
-    echo '-----------------'
+    echo 'Upload to PyPI'
+    echo '--------------'
     twine upload src/dist/* || exit 1
     echo ''
 fi