Merge 0c0a8d6dda into e820c9ce7b

dist/platforms/mac/steps/activate.sh

@@ -6,6 +6,28 @@ pushd "$ACTIVATE_LICENSE_PATH"
 
 echo "Requesting activation"
 
+if [[ -n "$UNITY_LICENSING_SERVER" ]]; then
+  #
+  # Custom Unity License Server
+  #
+  echo "Adding licensing server config"
+  mkdir -p "/Library/Application Support/Unity/config/"
+  cp \
+    "$ACTION_FOLDER/unity-config/services-config.json" \
+    "/Library/Application Support/Unity/config/services-config.json"
+  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/Frameworks/UnityLicensingClient.app/Contents/MacOS/Unity.Licensing.Client \
+    --acquire-floating > license.txt
+  UNITY_EXIT_CODE=$?
+
+  if [ $UNITY_EXIT_CODE -eq 0 ]; then
+    PARSEDFILE=$(grep -oE '\".*?\"' < license.txt | tr -d '"')
+    export FLOATING_LICENSE
+    FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE")
+    FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE")
+
+    echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT"
+  fi
+else
   # Activate license
   /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
     -logFile - \
@@ -19,7 +41,7 @@ echo "Requesting activation"
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?
-
+fi
 #
 # Display information about the result
 #

dist/platforms/mac/steps/build.sh

@@ -132,8 +132,6 @@ echo ""
   $( [ "${MANUAL_EXIT}" == "true" ] || echo "-quit" ) \
   -batchmode \
   -nographics \
-  -username "$UNITY_EMAIL" \
-  -password "$UNITY_PASSWORD" \
   -customBuildName "$BUILD_NAME" \
   -projectPath "$UNITY_PROJECT_PATH" \
   -buildTarget "$BUILD_TARGET" \

dist/platforms/mac/steps/return_license.sh

@@ -4,6 +4,14 @@
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
+
+if [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
+  #
+  # Return any floating license used.
+  #
+  echo "Returning floating license: \"$FLOATING_LICENSE\""
+  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/Frameworks/UnityLicensingClient.app/Contents/MacOS/Unity.Licensing.Client --return-floating "$FLOATING_LICENSE"
+else 
   /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
     -logFile - \
     -batchmode \
@@ -15,4 +23,6 @@ pushd "$ACTIVATE_LICENSE_PATH"
     -projectPath "$ACTIVATE_LICENSE_PATH"
 
     # Return to previous working directory
+fi
+
 popd

dist/platforms/ubuntu/steps/activate.sh

@@ -68,14 +68,16 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
   echo "Adding licensing server config"
 
   /opt/unity/Editor/Data/Resources/Licensing/Client/Unity.Licensing.Client --acquire-floating > license.txt #is this accessible in a env variable?
+  UNITY_EXIT_CODE=$?
+
+  if [ $UNITY_EXIT_CODE -eq 0 ]; then
     PARSEDFILE=$(grep -oP '\".*?\"' < license.txt | tr -d '"')
     export FLOATING_LICENSE
     FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE")
     FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE")
 
     echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT"
-  # Store the exit code from the verify command
-  UNITY_EXIT_CODE=$?
+  fi
 else
   #
   # NO LICENSE ACTIVATION STRATEGY MATCHED