From 2b0b48663aaf8843423ed7b7d6c5c3255a01229a Mon Sep 17 00:00:00 2001
From: Cat Flynn <me@ktyl.dev>
Date: Mon, 1 Feb 2021 11:20:34 +0000
Subject: [PATCH] remove unity kill check, instance pipeline

---
 .gitlab-ci.yml | 8 ++------
 ci/build.sh    | 8 --------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7961669..31e0733 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
 
 variables:
   GIT_STRATEGY: fetch
+  GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_PIPELINE_ID
 
   UNITY_VERSION: 2020.2.2f1
 
@@ -13,9 +14,8 @@ variables:
 
 build:
   stage: build
-  tags:
-  - unity
   script:
+  - echo "cloned to $GIT_CLONE_PATH"
   - chmod +x ./ci/build.sh
   - ./ci/build.sh $UNITY_VERSION
   artifacts:
@@ -25,8 +25,6 @@ build:
 
 deploy-dev:
   stage: deploy
-  tags:
-  - deploy
   rules:
   - if: $CI_COMMIT_BRANCH == $DEV_BRANCH
   variables:
@@ -41,8 +39,6 @@ deploy-dev:
 
 deploy-release:
   stage: deploy
-  tags:
-  - deploy
   rules:
   - if: $CI_COMMIT_TAG && $CI_COMMIT_BRANCH != $DEV_BRANCH
   variables:
diff --git a/ci/build.sh b/ci/build.sh
index 0046e9b..559e7ab 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -6,14 +6,6 @@ unityversion=$1
 editorlogpath="$HOME/Library/Logs/Unity/Editor.log"
 editorpath="/Applications/Unity/Hub/Editor/$unityversion/Unity.app"
 
-# find and kill existing unity instances
-echo "terminating existing unity processes..."
-while pgrep -x Unity > /dev/null
-do
-    kill $(pgrep Unity)
-    sleep 1
-done
-
 # remove previous Editor.log
 echo "removing previous editor log..."
 [ -f $editorlogpath ] && rm $editorlogpath