Merge pull request #549 from UIUCLibrary/clean-up-jenkins

clean-up-jenkins
UIUCLibrary · Nov 1, 2024 · 0b3c70a · 0b3c70a
2 parents 603bcc4 + 009d134
commit 0b3c70a
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,6 +4,7 @@ library identifier: 'JenkinsPythonHelperLibrary@2024.1.2', retriever: modernSCM(
    ])
 def getVersion(){
     node(){
+        checkout scm
         def props = readTOML( file: 'pyproject.toml')['project']
         return props.version
     }
@@ -913,19 +914,16 @@ pipeline {
                                                        )
                                                    } else {
                                                        installMSVCRuntime('c:\\msvc_runtime\\')
-                                                       bat(
-                                                           label: 'Install uv',
-                                                           script: '''python -m venv venv
-                                                                      call venv\\Scripts\\activate.bat
-                                                                      pip install uv
-                                                                   '''
-                                                       )
                                                        script{
                                                            retry(3){
                                                                bat(
                                                                    label: 'Testing with tox',
-                                                                   script: '''call venv\\Scripts\\activate.bat
+                                                                   script: '''python -m venv venv
+                                                                              call venv\\Scripts\\activate.bat
+                                                                              pip install uv
                                                                               uvx --with tox-uv tox
+                                                                              rmdir /S /Q .tox
+                                                                              rmdir /S /Q venv
                                                                            '''
                                                                )
                                                            }