From 262bc8adab0e11136826a28b98a2c95808a04aba Mon Sep 17 00:00:00 2001
From: evansiroky <evan.siroky@yahoo.com>
Date: Wed, 28 Nov 2018 20:14:15 -0800
Subject: [PATCH] fix(prepare, publish): properly wait for asynchronous
 functions

---
 lib/prepare.js | 2 +-
 lib/publish.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/prepare.js b/lib/prepare.js
index 5683a37..0df44a9 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -10,6 +10,6 @@ module.exports = async function publish (pluginConfig, context) {
   // special logic to do some extra Conveyal-specific tasks
   if (options.useConveyalWorkflow) {
     // commit and push version that was just deployed
-    saveChangesToPomXml(context, nextRelease.version)
+    await saveChangesToPomXml(context, nextRelease.version)
   }
 }
diff --git a/lib/publish.js b/lib/publish.js
index 6ed2280..c1991b7 100644
--- a/lib/publish.js
+++ b/lib/publish.js
@@ -27,11 +27,11 @@ module.exports = async function publish (pluginConfig, context) {
     )
 
     // commit and push snapshot version
-    saveChangesToPomXml(context, nextSnapshotVersionStr)
+    await saveChangesToPomXml(context, nextSnapshotVersionStr)
 
     if (options.devBranch) {
       // merge master into dev
-      mergeMasterIntoDev(context)
+      await mergeMasterIntoDev(context)
     }
   }
 }