Commit d010719b authored by Ben Cooksley's avatar Ben Cooksley

Update CI jobs for Windows - the builders are moving to VS 2019

parent c83621a0
Pipeline #2554 skipped with stage
...@@ -66,7 +66,7 @@ timestamps { ...@@ -66,7 +66,7 @@ timestamps {
stage('Configuring Build') { stage('Configuring Build') {
// This is delegated through a helper script to handle minor special cases like inSourceBuilds, non-CMake build systems, etc // This is delegated through a helper script to handle minor special cases like inSourceBuilds, non-CMake build systems, etc
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/configure-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/configure-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/"
""" """
...@@ -76,7 +76,7 @@ timestamps { ...@@ -76,7 +76,7 @@ timestamps {
stage('Compiling') { stage('Compiling') {
// We use a helper here so we can determine the appropriate number of CPUs (-j) to build with // We use a helper here so we can determine the appropriate number of CPUs (-j) to build with
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/compile-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/compile-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/"
""" """
...@@ -87,7 +87,7 @@ timestamps { ...@@ -87,7 +87,7 @@ timestamps {
// The helper ensures that DESTDIR and INSTALL_ROOT are set to 'divertTo' // The helper ensures that DESTDIR and INSTALL_ROOT are set to 'divertTo'
// This allows us to capture the install at the next stage for later reuse in the Setup Dependencies step // This allows us to capture the install at the next stage for later reuse in the Setup Dependencies step
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/install-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" --divertTo "%WORKSPACE%/install-divert/" python -u ci-tooling/helpers/install-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" --divertTo "%WORKSPACE%/install-divert/"
""" """
...@@ -98,7 +98,7 @@ timestamps { ...@@ -98,7 +98,7 @@ timestamps {
// Run the unit tests for this project // Run the unit tests for this project
// Tests are run in a basic environment (X, DBus) // Tests are run in a basic environment (X, DBus)
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/run-tests.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/run-tests.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/"
""" """
......
...@@ -66,7 +66,7 @@ timestamps { ...@@ -66,7 +66,7 @@ timestamps {
stage('Configuring Build') { stage('Configuring Build') {
// This is delegated through a helper script to handle minor special cases like inSourceBuilds, non-CMake build systems, etc // This is delegated through a helper script to handle minor special cases like inSourceBuilds, non-CMake build systems, etc
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/configure-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/configure-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/"
""" """
...@@ -76,7 +76,7 @@ timestamps { ...@@ -76,7 +76,7 @@ timestamps {
stage('Compiling') { stage('Compiling') {
// We use a helper here so we can determine the appropriate number of CPUs (-j) to build with // We use a helper here so we can determine the appropriate number of CPUs (-j) to build with
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/compile-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/compile-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/"
""" """
...@@ -87,7 +87,7 @@ timestamps { ...@@ -87,7 +87,7 @@ timestamps {
// The helper ensures that DESTDIR and INSTALL_ROOT are set to 'divertTo' // The helper ensures that DESTDIR and INSTALL_ROOT are set to 'divertTo'
// This allows us to capture the install at the next stage for later reuse in the Setup Dependencies step // This allows us to capture the install at the next stage for later reuse in the Setup Dependencies step
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/install-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" --divertTo "%WORKSPACE%/install-divert/" python -u ci-tooling/helpers/install-build.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/${projectName}/" --divertTo "%WORKSPACE%/install-divert/"
""" """
...@@ -109,7 +109,7 @@ timestamps { ...@@ -109,7 +109,7 @@ timestamps {
// Run the unit tests for this project // Run the unit tests for this project
// Tests are run in a basic environment (X, DBus) // Tests are run in a basic environment (X, DBus)
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/run-tests.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/" python -u ci-tooling/helpers/run-tests.py --product ${productName} --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --usingInstall "C:/CI/Software Installs/${projectName}/"
""" """
......
...@@ -58,7 +58,7 @@ ws('C:/CI/DepBuild/') { ...@@ -58,7 +58,7 @@ ws('C:/CI/DepBuild/') {
// Tests and Other Quality Tests won't be run during this process // Tests and Other Quality Tests won't be run during this process
// The results of this process are only intended to be used as part of the base of this Product, so don't need testing // The results of this process are only intended to be used as part of the base of this Product, so don't need testing
bat """ bat """
call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build/vcvars64.bat" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build/vcvars64.bat" -vcvars_ver=14.16
set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/ set CRAFT_ROOT=C:/Craft/CI-Qt511/windows-msvc2017_64-cl-debug/
python -u ci-tooling/helpers/build-product-dependencies.py --product ${productName} --branchGroup ${branchGroup} --environment ${ciEnvironment} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/Dependencies/" python -u ci-tooling/helpers/build-product-dependencies.py --product ${productName} --branchGroup ${branchGroup} --environment ${ciEnvironment} --platform ${currentPlatform} --installTo "C:/CI/Software Installs/Dependencies/"
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment