Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/windows upgrades #588

Merged
merged 26 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
70ae34a
Stop regsvr32 to prevent hanging on exit
AndrewKahr Oct 15, 2023
1f5e83e
Fix pathing issues for android keystore
AndrewKahr Oct 16, 2023
2b57efd
Setup memory/cpu limits for windows containers
AndrewKahr Oct 17, 2023
23efedb
Fix pathing issue
AndrewKahr Oct 17, 2023
44d4fb4
Debug prints
AndrewKahr Oct 18, 2023
d74bb9d
More debug prints
AndrewKahr Oct 19, 2023
32e3b41
Use different method to run unity to ensure it exits without hanging
AndrewKahr Oct 22, 2023
99e0cc4
Debug prints
AndrewKahr Oct 22, 2023
092e54d
Debug remove parameter array
AndrewKahr Oct 22, 2023
988d7e1
More debug
AndrewKahr Oct 22, 2023
24e05f8
More debug
AndrewKahr Oct 22, 2023
79c2e08
More debug
AndrewKahr Oct 22, 2023
908b8af
Fix null arg
AndrewKahr Oct 22, 2023
c7da222
Build array before call
AndrewKahr Oct 22, 2023
ed6252c
Fix logic issue
AndrewKahr Oct 22, 2023
41cf9f3
Revert unity call
AndrewKahr Oct 22, 2023
53f6978
Attempt to fix windows exit hang
AndrewKahr Oct 27, 2023
6f16f5f
Additional debug changes for fixing windows hanging
AndrewKahr Oct 27, 2023
10c4e7f
Output to console
AndrewKahr Oct 27, 2023
c59b213
Debugging
AndrewKahr Oct 27, 2023
9e22e88
Code cleanup
AndrewKahr Oct 27, 2023
d47dc75
Provide a default for linux to allow providing a custom limit on linu…
AndrewKahr Oct 27, 2023
974b785
Switch to process isolation mode by default and give an option to use…
AndrewKahr Oct 28, 2023
3375d93
Fix isolation mode to use default by default
AndrewKahr Oct 28, 2023
7e27d29
Merge branch 'main' into feature/windows-upgrades
AndrewKahr Oct 28, 2023
12c712d
Update isolation mode description
AndrewKahr Oct 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ inputs:
To manually specify a value, use the format <number><unit>, where unit is either m or g. ie: 512m = 512 megabytes'
dockerIsolationMode:
required: false
default: 'process'
default: 'default'
AndrewKahr marked this conversation as resolved.
Show resolved Hide resolved
description:
'Isolation mode to use for the docker container. Can be either process or hyperv. Only applicable on Windows'
'Isolation mode to use for the docker container. Can be one of process, hyperv, or default. Only applicable on
Windows'
allowDirtyBuild:
required: false
default: ''
Expand Down
3 changes: 2 additions & 1 deletion dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/model/build-parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ class BuildParameters {
public androidSdkManagerParameters!: string;
public androidExportType!: string;
public androidSymbolType!: string;
public dockerCpuLimit!: string;
public dockerMemoryLimit!: string;
public dockerIsolationMode!: string;

public customParameters!: string;
public sshAgent!: string;
Expand Down Expand Up @@ -160,6 +163,7 @@ class BuildParameters {
chownFilesTo: Input.chownFilesTo,
dockerCpuLimit: Input.dockerCpuLimit,
dockerMemoryLimit: Input.dockerMemoryLimit,
dockerIsolationMode: Input.dockerIsolationMode,
providerStrategy: CloudRunnerOptions.providerStrategy,
buildPlatform: CloudRunnerOptions.buildPlatform,
kubeConfig: CloudRunnerOptions.kubeConfig,
Expand Down
2 changes: 1 addition & 1 deletion src/model/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class Input {
}

static get dockerIsolationMode(): string {
return Input.getInput('dockerIsolationMode') || 'process';
return Input.getInput('dockerIsolationMode') || 'default';
}

public static ToEnvVarFormat(input: string) {
Expand Down
Loading