Skip to content

Commit 2ae69c2

Browse files
henryborchershenryborchers
committed
ci: cache python installers instead of installed application
1 parent 5db84c8 commit 2ae69c2

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

‎Jenkinsfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes){
158158
try{
159159
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python')
160160
.inside('\
161-
--mount type=volume,source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\cache\\uvpython \
161+
--mount type=volume,source=uv_python_cache_dir,target=C:\\Users\\ContainerUser\\Documents\\cache\\uvpython \
162162
--mount type=volume,source=pipcache,target=C:\\Users\\ContainerUser\\Documents\\cache\\pipcache \
163163
--mount type=volume,source=uv_cache_dir,target=C:\\Users\\ContainerUser\\Documents\\cache\\uvcache \
164164
--mount type=volume,source=msvc-runtime,target=c:\\msvc_runtime \
@@ -169,7 +169,7 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes){
169169
unstash "python${pythonVersion} windows wheel"
170170
withEnv([
171171
'PIP_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\pipcache',
172-
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvpython',
172+
'UV_PYTHON_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvpython',
173173
'UV_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvcache',
174174
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
175175
"UV_CONFIG_FILE=${createUVConfig()}"
@@ -258,7 +258,7 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes){
258258
withEnv([
259259
'PIP_CACHE_DIR=/tmp/pipcache',
260260
'UV_TOOL_DIR=/tmp/uvtools',
261-
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
261+
'UV_PYTHON_CACHE_DIR=/tmp/uvpython',
262262
'UV_CACHE_DIR=/tmp/uvcache',
263263
"UV_CONFIG_FILE=${createUVConfig()}"
264264
]){
@@ -519,7 +519,7 @@ pipeline {
519519
environment{
520520
PIP_CACHE_DIR='/tmp/pipcache'
521521
UV_TOOL_DIR='/tmp/uvtools'
522-
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
522+
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
523523
UV_CACHE_DIR='/tmp/uvcache'
524524
UV_CONFIG_FILE=createUVConfig()
525525
}
@@ -911,7 +911,7 @@ pipeline {
911911
environment{
912912
PIP_CACHE_DIR='/tmp/pipcache'
913913
UV_TOOL_DIR='/tmp/uvtools'
914-
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
914+
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
915915
UV_CACHE_DIR='/tmp/uvcache'
916916
}
917917
when{
@@ -989,7 +989,7 @@ pipeline {
989989
environment{
990990
PIP_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\pipcache'
991991
UV_TOOL_DIR='C:\\Users\\ContainerUser\\Documents\\uvtools'
992-
UV_PYTHON_INSTALL_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvpython'
992+
UV_PYTHON_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvpython'
993993
UV_CACHE_DIR='C:\\cache\\uvcache'
994994
}
995995
steps{
@@ -1001,7 +1001,7 @@ pipeline {
10011001
withEnv(["UV_CONFIG_FILE=${createUVConfig()}"]){
10021002
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python')
10031003
.inside("\
1004-
--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR} \
1004+
--mount type=volume,source=uv_python_cache_dir,target=${env.UV_PYTHON_CACHE_DIR} \
10051005
--mount type=volume,source=pipcache,target=${env.PIP_CACHE_DIR} \
10061006
--mount type=volume,source=uv_cache_dir,target=${env.UV_CACHE_DIR}\
10071007
"
@@ -1037,7 +1037,7 @@ pipeline {
10371037
try{
10381038
checkout scm
10391039
image.inside("\
1040-
--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR} \
1040+
--mount type=volume,source=uv_python_cache_dir,target=${env.UV_PYTHON_CACHE_DIR} \
10411041
--mount type=volume,source=pipcache,target=${env.PIP_CACHE_DIR} \
10421042
--mount type=volume,source=uv_cache_dir,target=${env.UV_CACHE_DIR}\
10431043
"
@@ -1246,7 +1246,7 @@ pipeline {
12461246
withEnv([
12471247
'PIP_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\pipcache',
12481248
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
1249-
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
1249+
'UV_PYTHON_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
12501250
'UV_CACHE_DIR=C:\\cache\\uvcache',
12511251
]){
12521252
def image
@@ -1261,7 +1261,7 @@ pipeline {
12611261
withEnv(["UV_CONFIG_FILE=${createUVConfig()}"]){
12621262

12631263
image.inside(
1264-
'--mount type=volume,source=uv_python_install_dir,target=$UV_PYTHON_INSTALL_DIR ' +
1264+
'--mount type=volume,source=uv_python_cache_dir,target=$UV_PYTHON_CACHE_DIR ' +
12651265
'--mount type=volume,source=pipcache,target=$PIP_CACHE_DIR '
12661266
// + '--mount type=volume,source=uv_cache_dir,target=$UV_CACHE_DIR'
12671267
){
@@ -1328,7 +1328,7 @@ pipeline {
13281328
withEnv([
13291329
'PIP_CACHE_DIR=/tmp/pipcache',
13301330
'UV_TOOL_DIR=/tmp/uvtools',
1331-
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
1331+
'UV_PYTHON_CACHE_DIR=/tmp/uvpython',
13321332
'UV_CACHE_DIR=/tmp/uvcache',
13331333
]){
13341334
def image
@@ -1396,7 +1396,7 @@ pipeline {
13961396
environment{
13971397
PIP_CACHE_DIR='/tmp/pipcache'
13981398
UV_TOOL_DIR='/tmp/uvtools'
1399-
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
1399+
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
14001400
UV_CACHE_DIR='/tmp/uvcache'
14011401
UV_CONFIG_FILE=createUVConfig()
14021402
}

0 commit comments

Comments
 (0)