From f96046dac7b692a47f05d4355c38796de91a9e61 Mon Sep 17 00:00:00 2001 From: Ely Ronnen Date: Wed, 6 Sep 2023 12:09:46 +0300 Subject: [PATCH] remove sshPublicKeysDirectoryPath and GIT_CONFIG_EXTENSIONS from windows runner for now --- dist/index.js | Bin 22170958 -> 22170535 bytes dist/index.js.map | Bin 14627746 -> 14627283 bytes dist/platforms/windows/entrypoint.ps1 | 3 -- .../windows/set_extra_git_configs.ps1 | 32 ------------------ src/model/docker.ts | 18 +--------- 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 dist/platforms/windows/set_extra_git_configs.ps1 diff --git a/dist/index.js b/dist/index.js index 3d94393794bbb3d7ded66263e6979acbad96338e..416f12b4bcf89f72dbfba874bfcf285551e89d29 100644 GIT binary patch delta 1470 zcmW;MRZtZG5Jus-c%@WC3__$t3=mNeK|)lJ5bW;m?oLeXx{BT1fsL&gh}~V-iXEuu z_u)IUPdodx>B(uH}b#+d0~ruutRSt$60Oi0ZO|6&&>kJo5uMN(UCcO{6TQ$Ieb5*E&>sUZ5Q8unLogJ>FdQQ=5~DC0V=xwp7>DtgfQgud$w9n%*8yIFdqw$jD=W)#aM!+Scc_Tft6T=)mVeIScmo4fQ{IM&Desi*oN)c zft}ce-PnT^?8QFp#{nF~Asj|3j^HSc;W$pNC{RdDj`a!5~hSJm6QmjvQkB_H>cv9!C zVv#SDmTXtJOoGjeGP!nSv`Mu&@#dDTj5pzSQH+^kFC-eLEsr&kJGUg5xnb7pGAWKi zTfksvyG(XwetP;e|KzEqMahL(o?*eFK+xkIUs~cT35Eg%A%DP=!Cjt7KL2#z*kXS$ z6wE5L7hT5f$hVa)QyjsrfZrdwz06K=n>c&SZR#%YCK*&kHB?6pgu{uNh(ImWMkJz8 z2hoT@EOd?wZp0xT2}ndeB%wYUAQ>rWh(>6PCTNOgXpRkJo5uK2Q&d5d=bVUww;YBxeM-TKwFZ4zqMDhF~b}z?~R|yKpy# zV+8KONQ}a0jKNssqX6Sji18@G1WZIRN^mbGVKPeLgCF-{3IYfsgsGT@>6n50@c?FG z79PZGJcK!T7;`ZXWtfjgumF!@Ar@gVmS8ECVL2Yd3OtS{@FZ4Z6)c{@(^!pX@GRC~ zE!JT@p2PFlfQ{IM7qA&G;w5as%XkH^;x)XEH}EF5VjH&OE$qNf?80vB!CvgcejGqK z4&rURgLm;B4&gA4;C)o!1AK^&@G*|!6CA^FoWQ5}44>m9PT@4p;4IGJJifq}xPY&4 z5ntmQe2edJ372sNSMfc5z>oL|KjRntir;Vz*YP|4z@PXFH*gbw;}$CM5B|k}i@iyX zM6G$ zR9~|OO0troG*lWXjg=-!Q>B^GTxp@SR8o~RC0)r-JW4C2wbDk(RN5--l=eyorK8eG z$x=Ei*-96stCFMSDqf|V(p~AH^i+B&y_G&np3+z8r}S3_C2g{(x9jqKzgC%MQ?9`cfp{1l)dg(yrB zic*Z?l%OP~C{3AgMzCyLdMG|FP$@hyE|8chbSpNH6pHB-$Q4eE58R7LO-=|eQenQPiR~b*M`{>eGORG$NYDG@&WYXif`S(u&r^5K9}{(vJ3YAdZg2 z(}~V>A%R4?(v9x)peMcPO&|KwkNylGiGd7aFhdy1ForXNk&I$AV;IXg#xsFrf=px* zlbOO)rZJrv%w!g`nZsP>F`or2WD$#5!ctOL#&TAW%1TzTnl-Ft9qZY^MmDjTEo@~Q z+X=CQo$O*ad)Ui9_H%%P9O5uXILa}ObApqc;xuPC%Q?<-fs3SZiOXE!Dq*g1og3Wb z7Pq;>UG8z82R!5vk9opVp7ER)yyO+HdBa=Y@tzNS0LSs!C{#otE&7&RQ7y_9Vzt?lBS*QSvMptM_Fs-0-GgrurF~f{M!8F5r{P3FhFP~4{k4B%$UyVN1rAm2PXhn#x{2dt-Maw*j%cJPv zg(heUZ}^}Ynxh4L;Rk=TL@NZKHQFE$L1>G1XpdlYKnV2ch)(G2_9&s|dg+xQtnNg! zh|@`jQMhDUituwcB#T-vnQ0Q?I*TkZi3pit5&^QxBw}K-qoa$|fMD;xPn6 zF$@V9ju9|oBobjl5=Oy{WTap;QZWW&F%ILAh6$L6NtlduWMB%WVj8An1~M@dvyg>s z!&!z!%C z8o00)>#!ahuo0WE8C$Rw<*2|mY{w4lgv2iF#vbg&KJ3Q<9K<0UMkS8mD30McPT(X? zp$eyQ24`^&=TVIdxQI)r!DU>58&`1+*Kq?kaSI;YMlJ5(F7Dwz9^fG!;W3`zDW2gu jUf?BO;WggiE$Z+N@9_a2@d@?#j4$|#26s*BH}Ufy;B5Ft diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index 0153e8f5..f0a6b555 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -5,9 +5,6 @@ Get-ChildItem -Path c:\regkeys -File | Foreach {reg import $_.fullname} # Register the Visual Studio installation so Unity can find it 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 & "c:\steps\set_gitcredential.ps1" diff --git a/dist/platforms/windows/set_extra_git_configs.ps1 b/dist/platforms/windows/set_extra_git_configs.ps1 deleted file mode 100644 index 1533b00c..00000000 --- a/dist/platforms/windows/set_extra_git_configs.ps1 +++ /dev/null @@ -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 diff --git a/src/model/docker.ts b/src/model/docker.ts index f35ba9af..24b93ab5 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -86,15 +86,7 @@ class Docker { } static getWindowsCommand(image: string, parameters: DockerParameters): string { - const { - workspace, - actionFolder, - unitySerial, - sshAgent, - sshPublicKeysDirectoryPath, - gitPrivateToken, - dockerWorkspacePath, - } = parameters; + const { workspace, actionFolder, unitySerial, gitPrivateToken, dockerWorkspacePath } = parameters; return `docker run \ --workdir c:${dockerWorkspacePath} \ @@ -102,7 +94,6 @@ class Docker { ${ImageEnvironmentFactory.getEnvVarString(parameters)} \ --env UNITY_SERIAL="${unitySerial}" \ --env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \ - --env GIT_CONFIG_EXTENSIONS \ ${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \ --volume "${workspace}":"c:${dockerWorkspacePath}" \ --volume "c:/regkeys":"c:/regkeys" \ @@ -112,13 +103,6 @@ class Docker { --volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \ --volume "${actionFolder}/platforms/windows":"c:/steps" \ --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} \ powershell c:/steps/entrypoint.ps1`; }