From 4a8ee6f820c37d56b8619f85c46f369113cc4bc0 Mon Sep 17 00:00:00 2001 From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com> Date: Wed, 26 Jan 2022 22:20:43 -0800 Subject: [PATCH] Fix project path windows --- dist/platforms/windows/Dockerfile | 1 + dist/platforms/windows/entrypoint.ps1 | 13 ------------- dist/platforms/windows/steps/activate.ps1 | 5 +---- dist/platforms/windows/steps/return_license.ps1 | 5 +---- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dist/platforms/windows/Dockerfile b/dist/platforms/windows/Dockerfile index 37169cdd..2e3c1d6d 100644 --- a/dist/platforms/windows/Dockerfile +++ b/dist/platforms/windows/Dockerfile @@ -13,6 +13,7 @@ LABEL "maintainer"="Webber Takken " COPY default-build-script c:/UnityBuilderAction COPY platforms/windows/steps c:/steps COPY platforms/windows/entrypoint.ps1 c:/entrypoint.ps1 +COPY BlankProject c:/BlankProject RUN dir ENTRYPOINT ["powershell", "c:/entrypoint.ps1"] diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index 68491131..b5255d11 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -1,10 +1,3 @@ -# -# Create directory for license activation -# - -ACTIVATE_LICENSE_PATH="$($Env:GITHUB_WORKSPACE)/_activate-license" -mkdir $ACTIVATE_LICENSE_PATH - # Activate Unity & "c:\steps\activate.ps1" @@ -20,9 +13,3 @@ regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio. # Free the seat for the activated license & "c:\steps\return_license.ps1" - -# -# Remove license activation directory -# - -Remove-Item -Path $ACTIVATE_LICENSE_PATH -Recurse diff --git a/dist/platforms/windows/steps/activate.ps1 b/dist/platforms/windows/steps/activate.ps1 index 76a4b878..0022dee3 100644 --- a/dist/platforms/windows/steps/activate.ps1 +++ b/dist/platforms/windows/steps/activate.ps1 @@ -1,10 +1,7 @@ -Push-Location $ACTIVATE_LICENSE_PATH - # Activates Unity & "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics ` -username $Env:UNITY_EMAIL ` -password $Env:UNITY_PASSWORD ` -serial $Env:UNITY_SERIAL ` + -projectPath "c:/BlankProject" ` -logfile | Out-Host - -Pop-Location diff --git a/dist/platforms/windows/steps/return_license.ps1 b/dist/platforms/windows/steps/return_license.ps1 index 363ebd3b..a60c1a1b 100644 --- a/dist/platforms/windows/steps/return_license.ps1 +++ b/dist/platforms/windows/steps/return_license.ps1 @@ -1,10 +1,7 @@ -Push-Location $ACTIVATE_LICENSE_PATH - # Return the active Unity license & "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics ` -username $Env:UNITY_EMAIL ` -password $Env:UNITY_PASSWORD ` -returnlicense ` + -projectPath "c:/BlankProject" ` -logfile | Out-Host - -Pop-Location