From 69b0604b91bcb6f490d63a3aa483a7945e84075b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 Jul 2020 09:29:44 +0100 Subject: [PATCH 1/3] ci: fixed version until chocolatey is ready --- .ci/.jenkins_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.jenkins_windows.yml b/.ci/.jenkins_windows.yml index 300a41cc3..b4968645c 100644 --- a/.ci/.jenkins_windows.yml +++ b/.ci/.jenkins_windows.yml @@ -18,6 +18,6 @@ windows: - VERSION: "3.7" WEBFRAMEWORK: "none" ASYNCIO: "true" - - VERSION: "3.8" + - VERSION: "3.8.3" WEBFRAMEWORK: "none" ASYNCIO: "true" From 7ef3254ce63fa2c30349338f717662580f41ad10 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 Jul 2020 13:58:40 +0100 Subject: [PATCH 2/3] Revert "ci: fixed version until chocolatey is ready" This reverts commit 69b0604b91bcb6f490d63a3aa483a7945e84075b. --- .ci/.jenkins_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.jenkins_windows.yml b/.ci/.jenkins_windows.yml index b4968645c..300a41cc3 100644 --- a/.ci/.jenkins_windows.yml +++ b/.ci/.jenkins_windows.yml @@ -18,6 +18,6 @@ windows: - VERSION: "3.7" WEBFRAMEWORK: "none" ASYNCIO: "true" - - VERSION: "3.8.3" + - VERSION: "3.8" WEBFRAMEWORK: "none" ASYNCIO: "true" From d80002db1356644358cb921f8b3f709d51b2584e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 Jul 2020 13:59:32 +0100 Subject: [PATCH 3/3] exclude RC versions when installing python --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8fac4cfbe..7ee73142a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -431,7 +431,7 @@ def generateStepForWindows(Map v = [:]){ deleteDir() unstash 'source' dir("${BASE_DIR}"){ - installTools([ [tool: "python${majorVersion}", version: "${env.VERSION}" ] ]) + installTools([ [tool: "python${majorVersion}", version: "${env.VERSION}", exclude: 'rc'] ]) bat(label: 'Install tools', script: '.\\scripts\\install-tools.bat') bat(label: 'Run tests', script: '.\\scripts\\run-tests.bat') }