actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix comment style and rename validateWindowsPrereqs to validateWindowsPlatformRequirements

pull/305/head
Andrew Kahr 2022-01-21 16:16:43 -08:00
parent 65c2007661
commit b2edd5fa91
4 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js vendored
View File

@ -444,7 +444,7 @@ class Docker {
throw new Error(`Unity email and password must be set for windows based builds`); throw new Error(`Unity email and password must be set for windows based builds`);
} }
yield this.setupWindowsRun(platform); yield this.setupWindowsRun(platform);
this.validateWindowsPrereqs(platform); this.validateWindowsPlatformRequirements(platform);
const windowsRunCommand = `docker run \ const windowsRunCommand = `docker run \
--workdir c:/github/workspace \ --workdir c:/github/workspace \
--rm \ --rm \
@ -531,8 +531,8 @@ class Docker {
yield exec_1.exec(exportWinSDKRegKeysCommand, undefined, { silent }); yield exec_1.exec(exportWinSDKRegKeysCommand, undefined, { silent });
}); });
} }
static validateWindowsPrereqs(platform) { static validateWindowsPlatformRequirements(platform) {
//We run different checks for different platforms //We run different checks for different target platforms
switch (platform) { switch (platform) {
case 'StandaloneWindows': case 'StandaloneWindows':
this.checkForVisualStudio(); this.checkForVisualStudio();

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
dist/platforms/windows/entrypoint.ps1 vendored
View File

@ -1,15 +1,15 @@
# First we activate Unity # Activate Unity
& "c:\steps\activate.ps1" & "c:\steps\activate.ps1"
# Next we import any necessary registry keys, ie: location of windows 10 sdk # Import any necessary registry keys, ie: location of windows 10 sdk
# No guarantee that there will be any necessary registry keys, ie: tvOS # No guarantee that there will be any necessary registry keys, ie: tvOS
Get-ChildItem -Path c:\regkeys -File | Foreach {reg import $_.fullname} Get-ChildItem -Path c:\regkeys -File | Foreach {reg import $_.fullname}
# Now we register the visual studio installation so Unity can find it # Register the Visual Studio installation so Unity can find it
regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.Setup.Configuration.Native.dll regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.Setup.Configuration.Native.dll
# Now we can build our project # Build the project
& "c:\steps\build.ps1" & "c:\steps\build.ps1"
# Finally free the seat for the activated license # Free the seat for the activated license
& "c:\steps\return_license.ps1" & "c:\steps\return_license.ps1"

6
src/model/docker.ts
View File

@ -122,7 +122,7 @@ class Docker {
await this.setupWindowsRun(platform); await this.setupWindowsRun(platform);
this.validateWindowsPrereqs(platform); this.validateWindowsPlatformRequirements(platform);
const windowsRunCommand = `docker run \ const windowsRunCommand = `docker run \
--workdir c:/github/workspace \ --workdir c:/github/workspace \
@ -210,8 +210,8 @@ class Docker {
await exec(exportWinSDKRegKeysCommand, undefined, { silent }); await exec(exportWinSDKRegKeysCommand, undefined, { silent });
} }
static validateWindowsPrereqs(platform) { static validateWindowsPlatformRequirements(platform) {
//We run different checks for different platforms //We run different checks for different target platforms
switch (platform) { switch (platform) {
case 'StandaloneWindows': case 'StandaloneWindows':
this.checkForVisualStudio(); this.checkForVisualStudio();