Better handling of errors in steam build, and better detection of lat…

…est build ID immediately after building.
jasonrohrer · Jul 19, 2019 · 307f61b · 307f61b
1 parent 3b63f65
commit 307f61b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/scripts/generateDataOnlyDiffBundle.sh b/scripts/generateDataOnlyDiffBundle.sh
@@ -533,10 +533,11 @@ echo ""
 oldBuildID=`~/checkout/OneLifeWorking/scripts/getLatestSteamBuildID.sh`
 
 
-steamcmd +login "jasonrohrergames" +run_app_build -desc OneLifeContent_v$newVersion ~/checkout/OneLifeWorking/build/steam/app_build_content_595690.vdf +quit
+steamcmd +login "jasonrohrergames" +run_app_build -desc OneLifeContent_v$newVersion ~/checkout/OneLifeWorking/build/steam/app_build_content_595690.vdf +quit | tee /tmp/steamBuildLog.txt
 
 
-newBuildID=`~/checkout/OneLifeWorking/scripts/getLatestSteamBuildID.sh`
+newBuildID=`grep BuildID /tmp/steamBuildLog.txt | sed "s/.*(BuildID //" | sed "s/).*//"`
+
 
 
 echo ""
@@ -555,8 +556,15 @@ then
 	echo "Remote Steam build starting"
 	echo
 
-	ssh -n build.onehouronelife.com 'cd ~/checkout/OneLifeWorking; git pull; ~/checkout/OneLifeWorking/scripts/generateSteamContentDepot.sh'
-
+    # two arguments means automation
+	if [ $# -ne 2 ]
+	then
+		# run ssh interactively so we can pause at error
+		ssh build.onehouronelife.com 'cd ~/checkout/OneLifeWorking; git pull; ~/checkout/OneLifeWorking/scripts/generateSteamContentDepot.sh'
+	else 
+		# automation, don't run ssh interactively
+		ssh -n build.onehouronelife.com 'cd ~/checkout/OneLifeWorking; git pull; ~/checkout/OneLifeWorking/scripts/generateSteamContentDepot.sh'
+	fi
 	echo
 	echo "Remote Steam build done"
 	echo

diff --git a/scripts/generateSteamContentDepot.sh b/scripts/generateSteamContentDepot.sh
@@ -140,10 +140,10 @@ echo ""
 oldBuildID=`~/checkout/OneLifeWorking/scripts/getLatestSteamBuildID.sh`
 
 
-steamcmd +login "jasonrohrergames" +run_app_build -desc OneLifeContent_v$newVersion ~/checkout/OneLifeWorking/build/steam/app_build_content_595690.vdf +quit
+steamcmd +login "jasonrohrergames" +run_app_build -desc OneLifeContent_v$newVersion ~/checkout/OneLifeWorking/build/steam/app_build_content_595690.vdf +quit | tee /tmp/steamBuildLog.txt
 
 
-newBuildID=`~/checkout/OneLifeWorking/scripts/getLatestSteamBuildID.sh`
+newBuildID=`grep BuildID /tmp/steamBuildLog.txt | sed "s/.*(BuildID //" | sed "s/).*//"`
 
 
 echo ""