From 17c236831e8917b63da16d144bb0e592eb81dc98 Mon Sep 17 00:00:00 2001
From: Cat Flynn <me@ktyl.dev>
Date: Mon, 1 Feb 2021 20:13:24 +0000
Subject: [PATCH] only deploy to prod for manual pipelines

---
 .gitlab-ci.yml | 2 +-
 ci/build.sh    | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bccee3..8f8c8d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ deploy-dev:
 deploy-release:
   stage: deploy
   rules:
-  - if: $CI_COMMIT_TAG && $CI_COMMIT_BRANCH == $PROD_BRANCH
+  - if: $CI_COMMIT_BRANCH == $PROD_BRANCH && $CI_MANUAL
   variables:
     ITCH_USER: "cyndrdev"
     ITCH_GAME: "revival"
diff --git a/ci/build.sh b/ci/build.sh
index 7299458..93a3dc4 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -49,7 +49,6 @@ do
     # check for exit
     # TODO: ideally we should have a better indicator than the package manager's shutdown message
     if [[ $line == *"[Package Manager] Server::Kill -- Server was shutdown"* ]]; then
-        echo "exit loop"
         break
     fi
 done
@@ -57,9 +56,7 @@ done
 # kill zombie tail process
 kill $(<"$work/tail.pid")
 
-exitcode=$(cat $work/exitcode)
-echo "exit $exitcode"
-
-exit $exitcode
+# exit with unity's exit code
+exit $(cat $work/exitcode)
 
 # vim: tabstop=4 shiftwidth=4 expandtab
\ No newline at end of file