diff --git a/dist/index.js b/dist/index.js index 2bdb4811..1753a290 100644 Binary files a/dist/index.js and b/dist/index.js differ diff --git a/dist/index.js.map b/dist/index.js.map index a47bee96..e840b3fe 100644 Binary files a/dist/index.js.map and b/dist/index.js.map differ diff --git a/dist/platforms/windows/build.ps1 b/dist/platforms/windows/build.ps1 index e8727618..e260e6c1 100644 --- a/dist/platforms/windows/build.ps1 +++ b/dist/platforms/windows/build.ps1 @@ -169,13 +169,15 @@ while (!$process.HasExited) { Start-Sleep -Seconds 10 Get-Process + $BUILD_EXIT_CODE = $process.ExitCode + # Display results - if ($process.ExitCode -eq 0) + if ($BUILD_EXIT_CODE -eq 0) { Write-Output "Build Succeeded!!" } else { - Write-Output "$('Build failed, with exit code ')$($process.ExitCode)$('"')" + Write-Output "$('Build failed, with exit code ')$($BUILD_EXIT_CODE)$('"')" } Write-Output "" @@ -187,7 +189,7 @@ while (!$process.HasExited) { Get-ChildItem $Env:BUILD_PATH_FULL Write-Output "" - exit $process.ExitCode + break } Start-Sleep -Seconds 5 diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index f156863d..07cbb070 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -12,16 +12,18 @@ regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio. Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force } # Setup Git Credentials -& "c:\steps\set_gitcredential.ps1" +. "c:\steps\set_gitcredential.ps1" # Activate Unity -& "c:\steps\activate.ps1" +. "c:\steps\activate.ps1" # Build the project -& "c:\steps\build.ps1" +. "c:\steps\build.ps1" # Free the seat for the activated license -& "c:\steps\return_license.ps1" +. "c:\steps\return_license.ps1" Start-Sleep -Seconds 3 Get-Process + +exit $BUILD_EXIT_CODE diff --git a/src/model/docker.ts b/src/model/docker.ts index 77645666..50cbf69f 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -15,7 +15,7 @@ class Docker { // eslint-disable-next-line unicorn/no-useless-undefined options: ExecOptions | undefined = undefined, entrypointBash: boolean = false, - errorWhenMissingUnityBuildResults: boolean = true, + errorWhenMissingUnityBuildResults: boolean = false, ) { let runCommand = ''; switch (process.platform) { diff --git a/src/model/exec-with-error-check.ts b/src/model/exec-with-error-check.ts index 3240a07d..3fe3030b 100644 --- a/src/model/exec-with-error-check.ts +++ b/src/model/exec-with-error-check.ts @@ -1,10 +1,10 @@ -import { getExecOutput, ExecOptions } from '@actions/exec'; +import { ExecOptions, getExecOutput } from '@actions/exec'; export async function execWithErrorCheck( commandLine: string, arguments_?: string[], options?: ExecOptions, - errorWhenMissingUnityBuildResults: boolean = true, + errorWhenMissingUnityBuildResults: boolean = false, ): Promise { const result = await getExecOutput(commandLine, arguments_, options);