diff --git a/action/steps/activate.sh b/action/steps/activate.sh index a20d3f51..9799c9a4 100644 --- a/action/steps/activate.sh +++ b/action/steps/activate.sh @@ -24,8 +24,7 @@ if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE" ]]; then fi # Activate license - ACTIVATION_OUTPUT=$(xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ - unity-editor \ + ACTIVATION_OUTPUT=$(unity-editor \ -batchmode \ -nographics \ -logFile /dev/stdout \ @@ -63,15 +62,14 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then echo "Requesting activation (professional license)" # Activate license - xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ - unity-editor \ - -batchmode \ - -nographics \ - -logFile /dev/stdout \ - -quit \ - -serial "$UNITY_SERIAL" \ - -username "$UNITY_EMAIL" \ - -password "$UNITY_PASSWORD" + unity-editor \ + -batchmode \ + -nographics \ + -logFile /dev/stdout \ + -quit \ + -serial "$UNITY_SERIAL" \ + -username "$UNITY_EMAIL" \ + -password "$UNITY_PASSWORD" # Store the exit code from the verify command UNITY_EXIT_CODE=$? diff --git a/action/steps/build.sh b/action/steps/build.sh index 843f2034..004be33e 100755 --- a/action/steps/build.sh +++ b/action/steps/build.sh @@ -108,24 +108,24 @@ echo "# Building platform #" echo "###########################" echo "" -xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ - unity-editor \ - -batchmode \ - -logfile /dev/stdout \ - -quit \ - -customBuildName "$BUILD_NAME" \ - -projectPath "$UNITY_PROJECT_PATH" \ - -buildTarget "$BUILD_TARGET" \ - -customBuildTarget "$BUILD_TARGET" \ - -customBuildPath "$CUSTOM_BUILD_PATH" \ - -executeMethod "$BUILD_METHOD" \ - -buildVersion "$VERSION" \ - -androidVersionCode "$ANDROID_VERSION_CODE" \ - -androidKeystoreName "$ANDROID_KEYSTORE_NAME" \ - -androidKeystorePass "$ANDROID_KEYSTORE_PASS" \ - -androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \ - -androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \ - $CUSTOM_PARAMETERS +unity-editor \ + -batchmode \ + -nographics \ + -logfile /dev/stdout \ + -quit \ + -customBuildName "$BUILD_NAME" \ + -projectPath "$UNITY_PROJECT_PATH" \ + -buildTarget "$BUILD_TARGET" \ + -customBuildTarget "$BUILD_TARGET" \ + -customBuildPath "$CUSTOM_BUILD_PATH" \ + -executeMethod "$BUILD_METHOD" \ + -buildVersion "$VERSION" \ + -androidVersionCode "$ANDROID_VERSION_CODE" \ + -androidKeystoreName "$ANDROID_KEYSTORE_NAME" \ + -androidKeystorePass "$ANDROID_KEYSTORE_PASS" \ + -androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \ + -androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \ + $CUSTOM_PARAMETERS # Catch exit code BUILD_EXIT_CODE=$? diff --git a/action/steps/return_license.sh b/action/steps/return_license.sh index c26a1ad0..96532a73 100644 --- a/action/steps/return_license.sh +++ b/action/steps/return_license.sh @@ -6,11 +6,10 @@ if [[ -n "$UNITY_SERIAL" ]]; then # # This will return the license that is currently in use. # - xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \ - unity-editor \ - -batchmode \ - -nographics \ - -logFile /dev/stdout \ - -quit \ - -returnlicense + unity-editor \ + -batchmode \ + -nographics \ + -logFile /dev/stdout \ + -quit \ + -returnlicense fi