Better Orb error cred givebacks

Author: EntropyFails

README.md

@@ -30,3 +30,12 @@ We welcome [issues](https://github.com/game-ci/unity-orb/issues) to and [pull re
 5. Now ensure the version tag selected is semantically accurate based on the changes included.
 6. Click _"Publish Release"_.
     - This will push a new tag and trigger your publishing pipeline on CircleCI.
+
+### Manual Deploy
+If you want a private orb for your build env. The following steps allow you to do so. These are adapted from the CircleCI
+[Manual Orb Authoring Process](https://circleci.com/docs/orb-author-validate-publish/#publish-your-orb)
+1. `circleci namespace create <name> --org-id <your-organization-id>`
+2. `circleci orb create <my-namespace>/<my-orb-name> --private`
+3. `circleci orb pack src > unity-orb.yml`
+4. `circleci orb publish unity-orb.yml <my-namespace>/<my-orb-name>@dev:first`
+5. `circleci orb publish promote <my-namespace>/<my-orb-name>@dev:first patch`

src/scripts/linux/git-credential.sh src/scripts/linux/set-gitcredential.sh

@@ -19,7 +19,7 @@ else
 fi
 
 echo "---------- git config --list -------------"
-git config --list
+git --no-pager config --list
 
 echo "---------- git config --list --show-origin -------------"
-git config --list --show-origin
+git --no-pager config --list --show-origin

src/scripts/macos/set-gitcredential.sh

@@ -19,7 +19,7 @@ else
 fi
 
 echo "---------- git config --list -------------"
-git config --list
+git --no-pager config --list
 
 echo "---------- git config --list --show-origin -------------"
-git config --list --show-origin
+git --no-pager config --list --show-origin

src/scripts/set-gitcredential.sh

@@ -12,7 +12,6 @@ detect-os
 
 # Expand environment name variable parameters.
 readonly git_private_token="${!PARAM_GIT_PRIVATE_TOKEN}"
-readonly CONTAINER_NAME="${CIRCLE_PROJECT_REPONAME}-${CIRCLE_BUILD_NUM}"
 
 if [ "$PLATFORM" = "linux" ]; then eval "$SCRIPT_GIT_CREDENTIAL_LINUX";
 elif [ "$PLATFORM" = "macos" ]; then eval "$SCRIPT_GIT_CREDENTIAL_MACOS";

src/scripts/windows/return-license.sh

@@ -3,19 +3,35 @@
 # shellcheck disable=SC2154
 
 trap_exit() {
-  local exit_status="$?"
-
-  if [ "$exit_status" -ne 0 ]; then
-    printf '%s\n' 'The script did not complete successfully.'
-
-    printf '%s\n' "Removing the container \"$CONTAINER_NAME\"."
-    docker rm -f "$CONTAINER_NAME" &> /dev/null || true
-
-    exit "$exit_status"
-  fi
+    local exit_status="$?"
+    
+    if [ "$exit_status" -ne 0 ]; then
+        printf '%s\n' 'The script did not complete successfully.'
+        
+        printf '%s\n' "Removing the container \"$CONTAINER_NAME\"."
+        docker rm -f "$CONTAINER_NAME" &> /dev/null || true
+        
+        exit "$exit_status"
+    fi
 }
 trap trap_exit EXIT
 
+running_builds=$(docker ps --filter "Name=$CONTAINER_NAME" --format "{{.ID}}")
+if [ -z "$running_builds" ]; then
+    # The build failed before and it killed the host
+    # Startup so we can return the license
+    docker run -dit \
+    --name "$CONTAINER_NAME" \
+    --env PROJECT_PATH="C:/unity_project" \
+    --env UNITY_USERNAME="$unity_username" \
+    --env UNITY_PASSWORD="$unity_password" \
+    --volume "C:/Program Files (x86)/Microsoft Visual Studio":"C:/Program Files (x86)/Microsoft Visual Studio" \
+    --volume "C:/Program Files (x86)/Windows Kits":"C:/Program Files (x86)/Windows Kits" \
+    --volume "C:/ProgramData/Microsoft/VisualStudio":"C:/ProgramData/Microsoft/VisualStudio" \
+    "unityci/editor:windows-${GAMECI_EDITOR_VERSION}-${GAMECI_TARGET_PLATFORM}-2" \
+    powershell 
+fi
+
 set -x
 # Return license
 docker exec "$CONTAINER_NAME" powershell '& "C:\Program Files\Unity\Hub\Editor\*\Editor\Unity.exe" -returnlicense -batchmode -quit -nographics -username $Env:UNITY_USERNAME -password $Env:UNITY_PASSWORD -logfile | Out-Host'

src/scripts/windows/set-gitcredential.sh

@@ -47,7 +47,7 @@ else
 fi
 
 echo "---------- git config --list -------------"
-docker exec "$CONTAINER_NAME" "git config --list"
+docker exec "$CONTAINER_NAME" "git --no-pager config --list"
 
 echo "---------- git config --list --show-origin -------------"
-docker exec "$CONTAINER_NAME" "git config --list --show-origin"
+docker exec "$CONTAINER_NAME" "git --no-pager config --list --show-origin"