Skip to content

Commit f96046d

Browse files
committed
remove sshPublicKeysDirectoryPath and GIT_CONFIG_EXTENSIONS from windows runner for now
1 parent d5cdc59 commit f96046d

File tree

5 files changed

+3
-60
lines changed

5 files changed

+3
-60
lines changed

dist/index.js

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/platforms/windows/entrypoint.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ Get-ChildItem -Path c:\regkeys -File | Foreach {reg import $_.fullname}
55
# Register the Visual Studio installation so Unity can find it
66
regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.Setup.Configuration.Native.dll
77

8-
# Setup Git Extra configs
9-
& "c:\steps\set_extra_git_configs.ps1"
10-
118
# Setup Git Credentials
129
& "c:\steps\set_gitcredential.ps1"
1310

dist/platforms/windows/set_extra_git_configs.ps1

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/model/docker.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,14 @@ class Docker {
8686
}
8787

8888
static getWindowsCommand(image: string, parameters: DockerParameters): string {
89-
const {
90-
workspace,
91-
actionFolder,
92-
unitySerial,
93-
sshAgent,
94-
sshPublicKeysDirectoryPath,
95-
gitPrivateToken,
96-
dockerWorkspacePath,
97-
} = parameters;
89+
const { workspace, actionFolder, unitySerial, gitPrivateToken, dockerWorkspacePath } = parameters;
9890

9991
return `docker run \
10092
--workdir c:${dockerWorkspacePath} \
10193
--rm \
10294
${ImageEnvironmentFactory.getEnvVarString(parameters)} \
10395
--env UNITY_SERIAL="${unitySerial}" \
10496
--env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \
105-
--env GIT_CONFIG_EXTENSIONS \
10697
${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
10798
--volume "${workspace}":"c:${dockerWorkspacePath}" \
10899
--volume "c:/regkeys":"c:/regkeys" \
@@ -112,13 +103,6 @@ class Docker {
112103
--volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
113104
--volume "${actionFolder}/platforms/windows":"c:/steps" \
114105
--volume "${actionFolder}/BlankProject":"c:/BlankProject" \
115-
${sshAgent ? `--volume ${sshAgent}:c:/ssh-agent` : ''} \
116-
${
117-
sshAgent && !sshPublicKeysDirectoryPath
118-
? `--volume c:/Users/Administrator/.ssh/known_hosts:c:/root/.ssh/known_hosts`
119-
: ''
120-
} \
121-
${sshPublicKeysDirectoryPath ? `--volume ${sshPublicKeysDirectoryPath}:c:/root/.ssh` : ''} \
122106
${image} \
123107
powershell c:/steps/entrypoint.ps1`;
124108
}

0 commit comments

Comments
 (0)