Skip to content

Commit

Permalink
Merge pull request #30 from UIUCLibrary/fix-ci
Browse files Browse the repository at this point in the history
Fix ci
  • Loading branch information
henryborchers authored Jan 17, 2025
2 parents 6dcd304 + a1310ca commit 953a8a9
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ pipeline {
returnStdout: true,
).trim().split('\n')
} finally{
sh "${tool(name: 'Default', type: 'git')} clean -dfx"
cleanWs(
patterns: [
[pattern: 'venv/', type: 'INCLUDE'],
Expand All @@ -519,17 +520,22 @@ pipeline {
]){
try{
sh( label: 'Running Tox',
script: """python3 -m venv venv && ./venv/bin/pip install --disable-pip-version-check uv
script: """python3 -m venv venv --clear && ./venv/bin/pip install --disable-pip-version-check uv
./venv/bin/uvx -p ${version} --python-preference only-system --with tox-uv tox run -e ${toxEnv} -vvv
"""
)
} catch(e) {
sh(script: '''. ./venv/bin/activate
uv python list
'''
)
script{
if(fileExists( 'venv/bin/uv')){
sh(script: '''. ./venv/bin/activate
uv python list
'''
)
}
}
throw e
} finally{
sh "${tool(name: 'Default', type: 'git')} clean -dfx"
cleanWs(
patterns: [
[pattern: 'venv/', type: 'INCLUDE'],
Expand Down

0 comments on commit 953a8a9

Please sign in to comment.