ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unity kill check, instance pipeline

This commit is contained in:
Cat Flynn 2021-02-01 11:20:34 +00:00
parent cb9c1a20f1
commit 2b0b48663a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -4,6 +4,7 @@ stages:
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_PIPELINE_ID
UNITY_VERSION: 2020.2.2f1 UNITY_VERSION: 2020.2.2f1
@ -13,9 +14,8 @@ variables:
build: build:
stage: build stage: build
tags:
- unity
script: script:
- echo "cloned to $GIT_CLONE_PATH"
- chmod +x ./ci/build.sh - chmod +x ./ci/build.sh
- ./ci/build.sh $UNITY_VERSION - ./ci/build.sh $UNITY_VERSION
artifacts: artifacts:
@ -25,8 +25,6 @@ build:
deploy-dev: deploy-dev:
stage: deploy stage: deploy
tags:
- deploy
rules: rules:
- if: $CI_COMMIT_BRANCH == $DEV_BRANCH - if: $CI_COMMIT_BRANCH == $DEV_BRANCH
variables: variables:
@ -41,8 +39,6 @@ deploy-dev:
deploy-release: deploy-release:
stage: deploy stage: deploy
tags:
- deploy
rules: rules:
- if: $CI_COMMIT_TAG && $CI_COMMIT_BRANCH != $DEV_BRANCH - if: $CI_COMMIT_TAG && $CI_COMMIT_BRANCH != $DEV_BRANCH
variables: variables:

8
ci/build.sh
View File

@ -6,14 +6,6 @@ unityversion=$1
editorlogpath="$HOME/Library/Logs/Unity/Editor.log" editorlogpath="$HOME/Library/Logs/Unity/Editor.log"
editorpath="/Applications/Unity/Hub/Editor/$unityversion/Unity.app" 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 # remove previous Editor.log
echo "removing previous editor log..." echo "removing previous editor log..."
[ -f $editorlogpath ] && rm $editorlogpath [ -f $editorlogpath ] && rm $editorlogpath