From 4c725bb09bcd1aebfbc71f9708dab7b1fc4a09d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 19:59:23 +0100 Subject: [PATCH 01/23] Add build using VS2015 to Azure Pipelines [skip travis] [skip appveyor] --- .azure-pipelines.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index bf57f89a0c..f4def69d49 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -78,6 +78,24 @@ jobs: use_conan: 'yes' cxxver: '17' + + - job: 'win2012_vs2015_cmake' + pool: + vmImage: 'vs2015-win2012r2' + steps: + - task: UsePythonVersion@0 + displayName: 'Setup Python' + inputs: + versionSpec: '3.6' + addToPath: true + architecture: 'x64' + - template: .ci/azure-pipelines/steps-check-cmake.yml + - template: .ci/azure-pipelines/steps-install-conan.yml + - template: .ci/azure-pipelines/steps-install-boost.yml + - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml + parameters: + use_conan: 'yes' + - job: 'macos1013_xcode91_cmake' pool: vmImage: 'macOS-10.13' From 9268070559b31f981bd54c3e119b31649367f1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 20:07:24 +0100 Subject: [PATCH 02/23] Remove UsePythonVersion task --- .azure-pipelines.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index f4def69d49..d2ba539a42 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,12 +83,6 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - task: UsePythonVersion@0 - displayName: 'Setup Python' - inputs: - versionSpec: '3.6' - addToPath: true - architecture: 'x64' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml - template: .ci/azure-pipelines/steps-install-boost.yml From 6c3e745254632e9eef579d3ba41da2295cd354ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 20:18:09 +0100 Subject: [PATCH 03/23] Restore UsePythonVersion but with Python 2.7 --- .azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d2ba539a42..7c7e41b575 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,6 +83,12 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: + - task: UsePythonVersion@0 + displayName: 'Setup Python' + inputs: + versionSpec: '2.7' + addToPath: true + architecture: 'x64' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml - template: .ci/azure-pipelines/steps-install-boost.yml From c4197531465f675592d0073ada9ec2130961b91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 20:26:51 +0100 Subject: [PATCH 04/23] Remove architecture parameter from UsePythonVersion task --- .azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 7c7e41b575..8aa1d8a5fc 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -88,7 +88,6 @@ jobs: inputs: versionSpec: '2.7' addToPath: true - architecture: 'x64' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml - template: .ci/azure-pipelines/steps-install-boost.yml From a9369ca6f8c50c851c952ab9598f768b71bc6b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:05:52 +0100 Subject: [PATCH 05/23] Replace UsePythonVersion with Python's ensurepip --- .azure-pipelines.yml | 5 ----- .ci/azure-pipelines/steps-install-conan.yml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8aa1d8a5fc..d2ba539a42 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,11 +83,6 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - task: UsePythonVersion@0 - displayName: 'Setup Python' - inputs: - versionSpec: '2.7' - addToPath: true - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml - template: .ci/azure-pipelines/steps-install-boost.yml diff --git a/.ci/azure-pipelines/steps-install-conan.yml b/.ci/azure-pipelines/steps-install-conan.yml index dc59a6c357..70507a4bb6 100644 --- a/.ci/azure-pipelines/steps-install-conan.yml +++ b/.ci/azure-pipelines/steps-install-conan.yml @@ -10,6 +10,7 @@ parameters: steps: - script: | ${{ parameters.python }} --version + ${{ parameters.python }} -m ensurepip ${{ parameters.python }} -m pip install --upgrade pip ${{ parameters.python }} -m pip install --upgrade conan conan --version From bcfd82cd2d467acb3c7c9a34bf96285cc404180e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:20:38 +0100 Subject: [PATCH 06/23] Use Chocolatey to install Python 3.7 --- .azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d2ba539a42..704e29fe1f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,8 +83,11 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: + - script: choco install --yes python --version 3.7.1 - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml + parameters: + python: C:\Python37\python.exe - template: .ci/azure-pipelines/steps-install-boost.yml - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml parameters: From 42a33fc34c112bbceef8ca87ffe4d181f9047557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:29:54 +0100 Subject: [PATCH 07/23] Download Python installer directly --- .azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 704e29fe1f..9619a7a2a6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,7 +83,9 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - script: choco install --yes python --version 3.7.1 + - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\python-3.7.1-setup.exe' + - script: | + C:\python-3.7.1-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml parameters: From d152a0ac064adbd1a446b3eb15e724184215c5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:41:03 +0100 Subject: [PATCH 08/23] Fiddle with Python in PATH --- .azure-pipelines.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 9619a7a2a6..eb8a36f1f3 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,9 +83,13 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\python-3.7.1-setup.exe' - - script: | - C:\python-3.7.1-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + - powershell: | + Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe + C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + python.exe --version + py -3 --version + [Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python37\Scripts", [System.EnvironmentVariableTarget]::Machine) + displayName: 'Setup Python' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml parameters: From 8f877467c2fccfd2ba525f5f8fe8f1ad9f7b57cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:45:25 +0100 Subject: [PATCH 09/23] Fiddle with Python in PATH --- .azure-pipelines.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index eb8a36f1f3..b83553a9f6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,13 +83,15 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: | - Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe + - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe' + displayName: 'Download Python' + - script: | C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 python.exe --version py -3 --version - [Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python37\Scripts", [System.EnvironmentVariableTarget]::Machine) - displayName: 'Setup Python' + displayName: 'Install Python' + - powershell: '[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python37\Scripts", [System.EnvironmentVariableTarget]::Machine)' + displayName: 'Fix Python in PATH' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml parameters: From 04458572f3f9eb0efb1c0e89cf6652e3c08041f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 21:59:05 +0100 Subject: [PATCH 10/23] Install Conan from installer --- .azure-pipelines.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index b83553a9f6..8711355f30 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,19 +83,13 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe' - displayName: 'Download Python' + - powershell: 'Invoke-WebRequest https://dl.bintray.com/conan/installers/conan-win-64_1_13_1.exe -OutFile C:\conan-setup.exe' + displayName: 'Download Conan' - script: | - C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - python.exe --version - py -3 --version - displayName: 'Install Python' - - powershell: '[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python37\Scripts", [System.EnvironmentVariableTarget]::Machine)' - displayName: 'Fix Python in PATH' + C:\conan-setup.exe /sp- /silent /norestart /nocloseapplications + conan --version + displayName: 'Install Conan' - template: .ci/azure-pipelines/steps-check-cmake.yml - - template: .ci/azure-pipelines/steps-install-conan.yml - parameters: - python: C:\Python37\python.exe - template: .ci/azure-pipelines/steps-install-boost.yml - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml parameters: From a2f3a85cc61fc4a9270de95e25c2bde0d78e7792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 22:06:28 +0100 Subject: [PATCH 11/23] Hack inability to persist PATH changes on AzP --- .azure-pipelines.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8711355f30..dc1e610e93 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,13 +83,20 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: 'Invoke-WebRequest https://dl.bintray.com/conan/installers/conan-win-64_1_13_1.exe -OutFile C:\conan-setup.exe' - displayName: 'Download Conan' + - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe' + displayName: 'Download Python' - script: | - C:\conan-setup.exe /sp- /silent /norestart /nocloseapplications - conan --version - displayName: 'Install Conan' + C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + python.exe --version + py -3 --version + mklink C:\Windows\python.exe C:\Python37\python.exe + mklink C:\Windows\conan.exe C:\Python37\Scripts\conan.exe + python.exe --version + displayName: 'Install Python' - template: .ci/azure-pipelines/steps-check-cmake.yml + - template: .ci/azure-pipelines/steps-install-conan.yml + parameters: + python: C:\Python37\python.exe - template: .ci/azure-pipelines/steps-install-boost.yml - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml parameters: From 1f01cd554ae41bef24b0bd4c8ce313235941b7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 22:36:10 +0100 Subject: [PATCH 12/23] Remove Python symlink --- .azure-pipelines.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index dc1e610e93..51a7b9c00d 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -87,11 +87,10 @@ jobs: displayName: 'Download Python' - script: | C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - python.exe --version + python --version py -3 --version - mklink C:\Windows\python.exe C:\Python37\python.exe mklink C:\Windows\conan.exe C:\Python37\Scripts\conan.exe - python.exe --version + conan --version displayName: 'Install Python' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml From 584966758fb67e1e78718195e44667946c5779c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:01:52 +0100 Subject: [PATCH 13/23] Replace symlink with ##vso[task.prependpath] --- .azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 51a7b9c00d..626f06eea0 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -87,10 +87,10 @@ jobs: displayName: 'Download Python' - script: | C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + @echo ##vso[task.prependpath]C:\Python37 + @echo ##vso[task.prependpath]C:\Python37\Scripts python --version py -3 --version - mklink C:\Windows\conan.exe C:\Python37\Scripts\conan.exe - conan --version displayName: 'Install Python' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml From a693282e3825da3e14a599451d1d408b1ab9370f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:11:31 +0100 Subject: [PATCH 14/23] Merge steps --- .azure-pipelines.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 626f06eea0..47d909354f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -83,14 +83,11 @@ jobs: pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe' - displayName: 'Download Python' - - script: | - C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - @echo ##vso[task.prependpath]C:\Python37 - @echo ##vso[task.prependpath]C:\Python37\Scripts - python --version - py -3 --version + - powershell: | + Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe + & C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + Write-Host "##vso[task.prependpath]C:\Python37" + Write-Host "##vso[task.prependpath]C:\Python37\Scripts" displayName: 'Install Python' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml From 9b59d87284928c5934f8962fc24172069c01c68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:16:33 +0100 Subject: [PATCH 15/23] Revert --- .azure-pipelines.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 47d909354f..d1cca2cc99 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -85,9 +85,11 @@ jobs: steps: - powershell: | Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe - & C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - Write-Host "##vso[task.prependpath]C:\Python37" - Write-Host "##vso[task.prependpath]C:\Python37\Scripts" + displayName: 'Download Python' + - script: | + C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 + @echo ##vso[task.prependpath]C:\Python37 + @echo ##vso[task.prependpath]C:\Python37\Scripts displayName: 'Install Python' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml From f423f225a9e03e17d481ac5f763e76769cdf3067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:28:36 +0100 Subject: [PATCH 16/23] Decrease required CMake from 3.10 to 3.7 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d5c5709f1..4e3cedbd96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ # of contributors. It does not export or install any targets, # deploy config files or support subproject workflow. # -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.7) #----------------------------------------------------------------------------- # Options From 77de6bbcf548df3585182955224fba8f1615c4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:46:21 +0100 Subject: [PATCH 17/23] Install latest CMake --- .azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d1cca2cc99..235122a023 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -91,6 +91,12 @@ jobs: @echo ##vso[task.prependpath]C:\Python37 @echo ##vso[task.prependpath]C:\Python37\Scripts displayName: 'Install Python' + - powershell: | + Invoke-WebRequest https://cmake.org/files/v3.14/cmake-3.14.0-win64-x64.zip -OutFile C:\cmake-3.14.0-win64-x64.zip + Expand-Archive C:\cmake.zip -DestinationPath C:\ + Rename-Item -Path C:\cmake-3.14.0-win64-x64 -NewName C:\cmake + Write-Host "##vso[task.prependpath]C:\cmake\bin" + displayName: 'Install CMake' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml parameters: From 2f052212965a7cd42ab459a7c00b3e5c742590fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 19 Mar 2019 23:50:24 +0100 Subject: [PATCH 18/23] Fix file name --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 235122a023..143da4aafa 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -93,7 +93,7 @@ jobs: displayName: 'Install Python' - powershell: | Invoke-WebRequest https://cmake.org/files/v3.14/cmake-3.14.0-win64-x64.zip -OutFile C:\cmake-3.14.0-win64-x64.zip - Expand-Archive C:\cmake.zip -DestinationPath C:\ + Expand-Archive C:\cmake-3.14.0-win64-x64.zip -DestinationPath C:\ Rename-Item -Path C:\cmake-3.14.0-win64-x64 -NewName C:\cmake Write-Host "##vso[task.prependpath]C:\cmake\bin" displayName: 'Install CMake' From bdf120056d51bb25fd5f4feee4925442cdcd3c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 20 Mar 2019 00:04:14 +0100 Subject: [PATCH 19/23] Final fiddling --- .azure-pipelines.yml | 12 +++++------- CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 143da4aafa..c53dc26add 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -85,18 +85,16 @@ jobs: steps: - powershell: | Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe - displayName: 'Download Python' - - script: | - C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 - @echo ##vso[task.prependpath]C:\Python37 - @echo ##vso[task.prependpath]C:\Python37\Scripts - displayName: 'Install Python' + C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 | Out-Null + Write-Host "##vso[task.prependpath]C:\Python37" + Write-Host "##vso[task.prependpath]C:\Python37\Scripts" + displayName: 'Install latest Python' - powershell: | Invoke-WebRequest https://cmake.org/files/v3.14/cmake-3.14.0-win64-x64.zip -OutFile C:\cmake-3.14.0-win64-x64.zip Expand-Archive C:\cmake-3.14.0-win64-x64.zip -DestinationPath C:\ Rename-Item -Path C:\cmake-3.14.0-win64-x64 -NewName C:\cmake Write-Host "##vso[task.prependpath]C:\cmake\bin" - displayName: 'Install CMake' + displayName: 'Install latest CMake' - template: .ci/azure-pipelines/steps-check-cmake.yml - template: .ci/azure-pipelines/steps-install-conan.yml parameters: diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e3cedbd96..8d5c5709f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ # of contributors. It does not export or install any targets, # deploy config files or support subproject workflow. # -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.10) #----------------------------------------------------------------------------- # Options From 5767828d95eadbd1c724d253a776ee6ef5ffc362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 20 Mar 2019 09:06:32 +0100 Subject: [PATCH 20/23] Delete GIL from installed Boost 1.68 [skip travis] [skip appveyor] --- .ci/azure-pipelines/steps-install-boost.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.ci/azure-pipelines/steps-install-boost.yml b/.ci/azure-pipelines/steps-install-boost.yml index 5dc27b86b4..1c3c7a2f8f 100644 --- a/.ci/azure-pipelines/steps-install-boost.yml +++ b/.ci/azure-pipelines/steps-install-boost.yml @@ -15,6 +15,11 @@ steps: tar -xf boost.tar.gz displayName: 'Download Boost' + - bash: | + cd boost_* + rm -rf libs/gil + displayName: 'Delete GIL from Boost 1.68' + - script: | cd boost_* ./bootstrap.sh From 57060ad6d12f7f179f402b4eb654d8e07c41e4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 20 Mar 2019 09:17:05 +0100 Subject: [PATCH 21/23] Fiddle with logs verbosity [skip travis] [skip appveyor] --- .azure-pipelines.yml | 2 ++ .ci/azure-pipelines/steps-install-boost.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c53dc26add..0aa5a6b778 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -88,7 +88,9 @@ jobs: C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 | Out-Null Write-Host "##vso[task.prependpath]C:\Python37" Write-Host "##vso[task.prependpath]C:\Python37\Scripts" + python --version displayName: 'Install latest Python' + - script: python --version - powershell: | Invoke-WebRequest https://cmake.org/files/v3.14/cmake-3.14.0-win64-x64.zip -OutFile C:\cmake-3.14.0-win64-x64.zip Expand-Archive C:\cmake-3.14.0-win64-x64.zip -DestinationPath C:\ diff --git a/.ci/azure-pipelines/steps-install-boost.yml b/.ci/azure-pipelines/steps-install-boost.yml index 1c3c7a2f8f..703313af5f 100644 --- a/.ci/azure-pipelines/steps-install-boost.yml +++ b/.ci/azure-pipelines/steps-install-boost.yml @@ -18,18 +18,18 @@ steps: - bash: | cd boost_* rm -rf libs/gil - displayName: 'Delete GIL from Boost 1.68' + displayName: 'Remove GIL from Boost 1.68' - script: | cd boost_* ./bootstrap.sh - sudo ./b2 -d0 -j4 variant=${{ parameters.variant }} toolset=${{ parameters.toolset }} --with-filesystem --with-test install + sudo ./b2 -j4 variant=${{ parameters.variant }} toolset=${{ parameters.toolset }} --with-filesystem --with-test install displayName: 'Install Boost on Unix' condition: ne(variables['Agent.OS'], 'Windows_NT') - script: | cd boost_* call .\bootstrap.bat - .\b2 -d0 -j4 variant=${{ parameters.variant }} --with-filesystem --with-test install + .\b2 -j4 variant=${{ parameters.variant }} --with-filesystem --with-test install displayName: 'Install Boost on Windows' condition: eq(variables['Agent.OS'], 'Windows_NT') From 815c9cc509e75dc7885f0ac9f97a15429cf08913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 20 Mar 2019 09:35:09 +0100 Subject: [PATCH 22/23] Fiddle with logs verbosity [skip travis] [skip appveyor] --- .azure-pipelines.yml | 17 +++++++---------- .ci/azure-pipelines/steps-install-boost.yml | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0aa5a6b778..58f8de19a2 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -78,26 +78,23 @@ jobs: use_conan: 'yes' cxxver: '17' - - job: 'win2012_vs2015_cmake' pool: vmImage: 'vs2015-win2012r2' steps: - - powershell: | - Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe - C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 | Out-Null - Write-Host "##vso[task.prependpath]C:\Python37" - Write-Host "##vso[task.prependpath]C:\Python37\Scripts" - python --version - displayName: 'Install latest Python' - - script: python --version - powershell: | Invoke-WebRequest https://cmake.org/files/v3.14/cmake-3.14.0-win64-x64.zip -OutFile C:\cmake-3.14.0-win64-x64.zip Expand-Archive C:\cmake-3.14.0-win64-x64.zip -DestinationPath C:\ Rename-Item -Path C:\cmake-3.14.0-win64-x64 -NewName C:\cmake Write-Host "##vso[task.prependpath]C:\cmake\bin" - displayName: 'Install latest CMake' + displayName: 'Install CMake 3.14' - template: .ci/azure-pipelines/steps-check-cmake.yml + - powershell: | + Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe + C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 | Out-Null + Write-Host "##vso[task.prependpath]C:\Python37" + Write-Host "##vso[task.prependpath]C:\Python37\Scripts" + displayName: 'Install Python 3.7' - template: .ci/azure-pipelines/steps-install-conan.yml parameters: python: C:\Python37\python.exe diff --git a/.ci/azure-pipelines/steps-install-boost.yml b/.ci/azure-pipelines/steps-install-boost.yml index 703313af5f..a10b706542 100644 --- a/.ci/azure-pipelines/steps-install-boost.yml +++ b/.ci/azure-pipelines/steps-install-boost.yml @@ -17,8 +17,9 @@ steps: - bash: | cd boost_* - rm -rf libs/gil - displayName: 'Remove GIL from Boost 1.68' + rm -r libs/gil + dir libs + displayName: 'Remove libs/gil from Boost 1.68' - script: | cd boost_* From c7cc98b926d704c899ded02690214ae84c9a9594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 20 Mar 2019 10:00:12 +0100 Subject: [PATCH 23/23] Fiddle with logs verbosity [skip travis] [skip appveyor] --- .ci/azure-pipelines/steps-install-boost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/azure-pipelines/steps-install-boost.yml b/.ci/azure-pipelines/steps-install-boost.yml index a10b706542..bb6c7e6746 100644 --- a/.ci/azure-pipelines/steps-install-boost.yml +++ b/.ci/azure-pipelines/steps-install-boost.yml @@ -18,7 +18,7 @@ steps: - bash: | cd boost_* rm -r libs/gil - dir libs + ls libs displayName: 'Remove libs/gil from Boost 1.68' - script: |