Skip to content

Commit 081c61e

Browse files
authored
Fix Xlang IO Direct installGcpTest uv cache lock (#38862)
* Fix Xlang IO Direct installGcpTest uv cache lock * use with per env cache dir * Added quote paths * test workflows
1 parent 3eb0031 commit 081c61e

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
33
"pr": "38069",
4-
"modification": 48
4+
"modification": 49
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 3
3+
"modification": 6
44
}

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3141,9 +3141,11 @@ class BeamModulePlugin implements Plugin<Project> {
31413141
if (extra) {
31423142
installTargets = "${distTarBall}[${packages},${extra}]"
31433143
}
3144+
def uvCacheDir = "${project.ext.envdir}/.uv_cache"
31443145
project.exec {
31453146
executable 'sh'
3146-
args '-c', ". ${project.ext.envdir}/bin/activate && pip install uv && uv pip install --pre ${installTargets}"
3147+
// Default uv cache is global; py310/py314 installGcpTest fight over the same lock.
3148+
args '-c', ". \"${project.ext.envdir}/bin/activate\" && pip install uv && uv pip install --cache-dir \"${uvCacheDir}\" --pre \"${installTargets}\""
31473149
}
31483150
}
31493151
}

0 commit comments

Comments
 (0)