From 108c8501686b9fa30f8314920a0a3ac17c42b63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Lupian=CC=83ez=20Casares?= Date: Tue, 29 Apr 2025 11:46:40 +0200 Subject: [PATCH] Testing two more approaches --- dist/index.js | Bin 15153344 -> 15153419 bytes dist/index.js.map | Bin 16832423 -> 16832507 bytes dist/platforms/windows/entrypoint.ps1 | 4 ++-- src/model/docker.ts | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 566d8bbc0795aa1105077274c4cdacfc6627be9f..dab386f0f110d2d80130772f24bd3cd1999b455d 100644 GIT binary patch delta 1000 zcmWm4M|21V007X35UX~r8WC!=l30x`l8}f-5=BdmSXn9qi9LeYn^ufiEj3C@tG3o? zX^qz2d)*v3x$zzT?Vos66u9VhQDA;Sv4Y|SCH4m_jOY{+l9Dw(s9#dAFxcKg!gQGiyrDf!%=M7KK&P)jl&CAIgk)4&AkrtYpojE$V@NIZNYT@#z zfb#QRMg&ljQUp?(GL)qp@6QKRpdyv1Ockn9jSs0#4Qf)0+I&PE>QayT1kr$C8q$c5 zX-pHE(u_~|l;(sGN*FC@Nh?~@hR+D6E$wJe2RhP;&U7Jyu0#?=G~MV<46*bej-Gr@ zJiSODktBNa1%2pCKfdHE`ZIv98OR_8GlXP@GK}GjU?eG|l14fijN%(clSvlYS@ zj3bvk#xsG5Oky%qn94M!GlP6)GK<+1Fo(I!V?GO5$RZZAgrzKFIV)JnD!%1AR#V6t z*0PTE6tRJgY+^H8_?{ow$~JyvJ3H9PE`DM+d-$1O*vmeCSnGn&(amb9WZZD>n7+7m$sI?{>GbfGKVh@?9`=t(bn(}%wFqdx-} z$RGwYgrN*$I3pOzC`L1ev5aFp6PU;(CNqVpOk+ATn8_?=Gl#j%BZ~PfU?I^gVlgo+ zVJWf1v5e)cU?rhdkmjPk72Ro|D20 iUh<09yx}eHc+Uqu@`=xU;Va+x&JTVjg@pe~`TGyQZdOzP diff --git a/dist/index.js.map b/dist/index.js.map index 21d45a8be2cf6ee582b9deec7bf596c436aada3a..9da4174ada9b27694f192c552307513fae9861af 100644 GIT binary patch delta 1147 zcmXxXd3X*40KnmA8HSKllu#=aYYQd0nQcDCR#8O89NVH+mwXFq!!H+Q(}|a#Rn2n;sc3sjk`p~Hi${f$Vm^S zre_6v#YBg)gFUkP_RdI)&dCa97K{i+md_7_BDsfqsYZ2ba3A+mlUhXa0MW$oAhoGO zT^{0L>hTEmd6Wh;q!Ep2LQ|U2oEF5=k~rc?pcMgH(}qOa(vBpOd5p(-g7$RaNuHu3 zop_qgbm1Agl0rASlS&VI(u>}tkxmAEc$Q3p^d*aI`q7`~$RR{7&oh953}P@t7|II_ zV>lxiNgglq5-*d_C`L1eS9q1NjN>)NGlAEc$Rs8+g#xDX25<5f)0oZ-W-^P}yv;kz zVJ`17kN23*0v57}#k|iFma>fHtY9S{u!=%fvxW~@%R1JxfsK5`CN{H$kNJd8*~&Jy zvxA-NVmEu(%V&Jf7ktTA>|;L%_?mC{mhbqUANY}<_?ch$mESnXAr5nd-}!?-Im$8q k;&1-pI43yCDNb{Svz+5R7r4kJF7q${ab;~F6xKEMDh_h!N&o-= delta 1080 zcmX}eXP6EI007|UI^%q2Q(UNv%)25gGhIUVOrbit5Hd3E6J^xJ*%|R!XU~i7td7no z%BJFyks@VlS!JE~mmlx*ytmSlB9@UJ+i!YYRAeaiLV=j6BO(H!aV3l1&&Z7EMqydu zp}14IBa;Hb2QHJk2vaOLb~clUmfK4$o1S z=ZWJ5>hU7=X+T3>q7jX0LQ|U2oEEgC6|HGQTVAFeukb4E=|D$b<8|I3o=&_;XA*de zE_9_EZ_}L~^yD3S(VIT>-EM^HyS;lf!kjiJQWEG#2 zMmnom!&=s{o-fE?0~`60Og6EZEo|j0zGfTS`G#-V!A^Fun?3AhANx7LcYMze9OMvL z{K#Q`;s{4M#&Le;1i$brCppD$oaT4_;0$Lu$9XPrkxN|WPyXU>{^4J)aFuIZ=LY}r TKR3C>ZSHWF?97zJu=s>~0SOyf diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index 25316ef3..9bd9b37f 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -8,8 +8,8 @@ Get-ChildItem -Recurse "C:\Users" | ForEach-Object { # Copy .upmconfig.toml if it exists if (Test-Path "C:\githubhome\.upmconfig.toml") { - Write-Host "Copying .upmconfig.toml to C:\ProgramData\Unity\config\upmconfig.toml" - Copy-Item -Path "C:\githubhome\.upmconfig.toml" -Destination "C:\ProgramData\Unity\config\upmconfig.toml" -Force + Write-Host "Copying .upmconfig.toml to $Env:USERPROFILE\.upmconfig.toml" + Copy-Item -Path "C:\githubhome\.upmconfig.toml" -Destination "$Env:USERPROFILE\.upmconfig.toml" -Force } else { Write-Host "No .upmconfig.toml found at C:\githubhome" } diff --git a/src/model/docker.ts b/src/model/docker.ts index 75190a25..21344429 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -111,6 +111,7 @@ class Docker { --rm \ ${ImageEnvironmentFactory.getEnvVarString(parameters)} \ --env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \ + --env UPM_GLOBAL_CONFIG_FILE="C:/githubhome/.upmconfig.toml" \ ${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \ --volume "${workspace}":"c:${dockerWorkspacePath}" \ --volume "${githubHome}":"C:/githubhome" \