Skip to content
Merged

Dev #89

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions vars/runJenkinsPipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def testPackage(entry, params){
withEnv([
'PIP_CACHE_DIR=/tmp/pipcache',
'UV_TOOL_DIR=/tmp/uvtools',
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
'UV_PYTHON_CACHE_DIR=/tmp/uvpython',
'UV_CACHE_DIR=/tmp/uvcache',
"UV_CONFIG_FILE=${createUnixUvConfig()}"
]){
Expand Down Expand Up @@ -214,7 +214,7 @@ def deploySingleStandalone(file, url, authentication) {

def getToxEnvs(){
node('docker && windows'){
docker.image('python').inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"){
docker.image('python').inside("--mount type=volume,source=uv_python_cache_dir,target=${env.UV_PYTHON_CACHE_DIR}"){
try{
checkout scm
bat(script: 'python -m venv venv && venv\\Scripts\\pip install --disable-pip-version-check uv')
Expand Down Expand Up @@ -314,7 +314,7 @@ def call(){
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
UV_CONFIG_FILE=createUnixUvConfig()
}
Expand Down Expand Up @@ -522,7 +522,7 @@ def call(){
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
}
steps{
Expand Down Expand Up @@ -553,13 +553,12 @@ def call(){
node('docker && linux'){
try{
checkout scm
docker.image('ghcr.io/astral-sh/uv:debian').inside("--label=purpose=ci --label \"JOB_NAME=\$JOB_NAME\" --label \"absoluteUrl=${currentBuild.absoluteUrl}\" --label \"BUILD_NUMBER=${currentBuild.number}\" --mount source=python-tmp-galatea,target=/tmp --mount type=tmpfs,dst=/.local --tmpfs /tmp_data:exec -e UV_PROJECT_ENVIRONMENT=/tmp_data/.venv"){
docker.image('ghcr.io/astral-sh/uv:debian').inside("--label=purpose=ci --label \"JOB_NAME=\$JOB_NAME\" --label \"absoluteUrl=${currentBuild.absoluteUrl}\" --label \"BUILD_NUMBER=${currentBuild.number}\" --mount source=python-tmp-galatea,target=/tmp --tmpfs /.local/share:exec --tmpfs /.local/bin:exec --mount type=tmpfs,dst=/.local --tmpfs /tmp_data:exec -e UV_PROJECT_ENVIRONMENT=/tmp_data/.venv"){
retry(3){
withEnv(["UV_CONFIG_FILE=${createUnixUvConfig()}"]){
sh "uv python install cpython-${version}"
sh( label: 'Running Tox',
script: """uv python install cpython-${version}
uv run --only-group=tox-uv --frozen tox run -e ${toxEnv} --runner uv-venv-lock-runner --workdir /tmp_data/.tox
"""
script: "uv run --managed-python --only-group=tox-uv --frozen tox run -e ${toxEnv} --runner uv-venv-lock-runner --workdir /tmp_data/.tox"
)
}
}
Expand All @@ -582,7 +581,7 @@ def call(){
environment{
PIP_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\pipcache'
UV_TOOL_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvtools'
UV_PYTHON_INSTALL_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvpython'
UV_PYTHON_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvpython'
UV_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvcache'
}
steps{
Expand All @@ -592,7 +591,7 @@ def call(){
try{
checkout scm
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python')
.inside("--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR}"
.inside("--mount type=volume,source=uv_python_cache_dir,target=${env.UV_PYTHON_CACHE_DIR}"
+ " --mount type=volume,source=pipcache,target=${env.PIP_CACHE_DIR}"
+ " --mount type=volume,source=uv_cache_dir,target=${env.UV_CACHE_DIR}"
){
Expand Down Expand Up @@ -621,7 +620,7 @@ def call(){
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python')
.inside("\
--label=purpose=ci --label \"JOB_NAME=\$JOB_NAME\" --label \"absoluteUrl=${currentBuild.absoluteUrl}\" --label \"BUILD_NUMBER=${currentBuild.number}\" \
--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR} \
--mount type=volume,source=uv_python_cache_dir,target=${env.UV_PYTHON_CACHE_DIR} \
--mount type=volume,source=pipcache,target=${env.PIP_CACHE_DIR} \
--mount type=volume,source=uv_cache_dir,target=${env.UV_CACHE_DIR} \
"
Expand Down Expand Up @@ -1017,7 +1016,7 @@ def call(){
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_PYTHON_CACHE_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
}
agent {
Expand Down
Loading