mirror of
https://github.com/game-ci/unity-builder.git
synced 2025-07-07 20:35:33 -04:00
remove sshPublicKeysDirectoryPath and GIT_CONFIG_EXTENSIONS from windows runner for now
This commit is contained in:
parent
d5cdc5945c
commit
f96046dac7
BIN
dist/index.js
generated
vendored
BIN
dist/index.js
generated
vendored
Binary file not shown.
BIN
dist/index.js.map
generated
vendored
BIN
dist/index.js.map
generated
vendored
Binary file not shown.
3
dist/platforms/windows/entrypoint.ps1
vendored
3
dist/platforms/windows/entrypoint.ps1
vendored
@ -5,9 +5,6 @@ Get-ChildItem -Path c:\regkeys -File | Foreach {reg import $_.fullname}
|
|||||||
# 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
|
||||||
|
|
||||||
# Setup Git Extra configs
|
|
||||||
& "c:\steps\set_extra_git_configs.ps1"
|
|
||||||
|
|
||||||
# Setup Git Credentials
|
# Setup Git Credentials
|
||||||
& "c:\steps\set_gitcredential.ps1"
|
& "c:\steps\set_gitcredential.ps1"
|
||||||
|
|
||||||
|
32
dist/platforms/windows/set_extra_git_configs.ps1
vendored
32
dist/platforms/windows/set_extra_git_configs.ps1
vendored
@ -1,32 +0,0 @@
|
|||||||
if ([string]::IsNullOrEmpty($env:GIT_CONFIG_EXTENSIONS)) {
|
|
||||||
Write-Host "GIT_CONFIG_EXTENSIONS unset skipping"
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Write-Host "GIT_CONFIG_EXTENSIONS is set configuring git extra configs"
|
|
||||||
|
|
||||||
$configs = $env:GIT_CONFIG_EXTENSIONS -split "`n"
|
|
||||||
foreach ($config in $configs) {
|
|
||||||
$config = $config.Trim()
|
|
||||||
if ([string]::IsNullOrEmpty($config)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($config -match '"([^"]+)" "([^"]+)"') {
|
|
||||||
$key = $matches[1]
|
|
||||||
$value = $matches[2]
|
|
||||||
|
|
||||||
Write-Output "Adding extra git config: ""$key"" = ""$value"""
|
|
||||||
git config --global --add $key $value
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Write-Output "Invalid extra git config: $config"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "---------- git config --list -------------"
|
|
||||||
git config --list
|
|
||||||
|
|
||||||
Write-Host "---------- git config --list --show-origin -------------"
|
|
||||||
git config --list --show-origin
|
|
@ -86,15 +86,7 @@ class Docker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static getWindowsCommand(image: string, parameters: DockerParameters): string {
|
static getWindowsCommand(image: string, parameters: DockerParameters): string {
|
||||||
const {
|
const { workspace, actionFolder, unitySerial, gitPrivateToken, dockerWorkspacePath } = parameters;
|
||||||
workspace,
|
|
||||||
actionFolder,
|
|
||||||
unitySerial,
|
|
||||||
sshAgent,
|
|
||||||
sshPublicKeysDirectoryPath,
|
|
||||||
gitPrivateToken,
|
|
||||||
dockerWorkspacePath,
|
|
||||||
} = parameters;
|
|
||||||
|
|
||||||
return `docker run \
|
return `docker run \
|
||||||
--workdir c:${dockerWorkspacePath} \
|
--workdir c:${dockerWorkspacePath} \
|
||||||
@ -102,7 +94,6 @@ class Docker {
|
|||||||
${ImageEnvironmentFactory.getEnvVarString(parameters)} \
|
${ImageEnvironmentFactory.getEnvVarString(parameters)} \
|
||||||
--env UNITY_SERIAL="${unitySerial}" \
|
--env UNITY_SERIAL="${unitySerial}" \
|
||||||
--env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \
|
--env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \
|
||||||
--env GIT_CONFIG_EXTENSIONS \
|
|
||||||
${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
|
${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
|
||||||
--volume "${workspace}":"c:${dockerWorkspacePath}" \
|
--volume "${workspace}":"c:${dockerWorkspacePath}" \
|
||||||
--volume "c:/regkeys":"c:/regkeys" \
|
--volume "c:/regkeys":"c:/regkeys" \
|
||||||
@ -112,13 +103,6 @@ class Docker {
|
|||||||
--volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
|
--volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
|
||||||
--volume "${actionFolder}/platforms/windows":"c:/steps" \
|
--volume "${actionFolder}/platforms/windows":"c:/steps" \
|
||||||
--volume "${actionFolder}/BlankProject":"c:/BlankProject" \
|
--volume "${actionFolder}/BlankProject":"c:/BlankProject" \
|
||||||
${sshAgent ? `--volume ${sshAgent}:c:/ssh-agent` : ''} \
|
|
||||||
${
|
|
||||||
sshAgent && !sshPublicKeysDirectoryPath
|
|
||||||
? `--volume c:/Users/Administrator/.ssh/known_hosts:c:/root/.ssh/known_hosts`
|
|
||||||
: ''
|
|
||||||
} \
|
|
||||||
${sshPublicKeysDirectoryPath ? `--volume ${sshPublicKeysDirectoryPath}:c:/root/.ssh` : ''} \
|
|
||||||
${image} \
|
${image} \
|
||||||
powershell c:/steps/entrypoint.ps1`;
|
powershell c:/steps/entrypoint.ps1`;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user