Merge branch 'master' into wyszynski/database-emulator-v4.2.0

firebase · Jul 30, 2019 · c50cd0c · c50cd0c
2 parents ae26232 + ffcdd55
commit c50cd0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/changelog.txt → CHANGELOG.md b/changelog.txt → CHANGELOG.md
diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -68,8 +68,8 @@ cd "${REPOSITORY_NAME}"
 echo "Cloned repository."
 
 echo "Making sure there is a changelog..."
-if [ ! -s changelog.txt ]; then
-  echo "changelog.txt is empty. aborting."
+if [ ! -s CHANGELOG.md ]; then
+  echo "CHANGELOG.md is empty. aborting."
   exit 1
 fi
 echo "Made sure there is a changelog."
@@ -92,17 +92,17 @@ RELEASE_NOTES_FILE=$(mktemp)
 echo "[DEBUG] ${RELEASE_NOTES_FILE}"
 echo "v${NEW_VERSION}" >> "${RELEASE_NOTES_FILE}"
 echo "" >> "${RELEASE_NOTES_FILE}"
-cat changelog.txt >> "${RELEASE_NOTES_FILE}"
+cat CHANGELOG.md >> "${RELEASE_NOTES_FILE}"
 echo "Made the release notes."
 
 echo "Publishing to npm..."
 npm publish
 echo "Published to npm."
 
 echo "Cleaning up release notes..."
-rm changelog.txt
-touch changelog.txt
-git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" changelog.txt
+rm CHANGELOG.md
+touch CHANGELOG.md
+git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md
 echo "Cleaned up release notes."
 
 echo "Pushing to GitHub..."