commit 0b7e47c016b633fbb9883152c828f5aca201e67b
author Andrew Stitcher <astitcher@apache.org> Thu Jul 23 17:02:01 2020 -0400
committer Andrew Stitcher <astitcher@apache.org> Fri Jul 24 07:09:32 2020 -0400
tree 22d15f7ec0f59282ec7b49406f5d325e4142d84b
parent 9d9272c4ba3e47029e54e40eb3ba1f9231a652f7

NO-JIRA: Attempt to fix swig and jsoncpp for azure windows build
- Change python version to one that works for builds on all OSes
- Turns out that the choco swig 4.0.2 is broken

azure-pipelines/azure-pipelines.yml

diff --git a/azure-pipelines/azure-pipelines.yml b/azure-pipelines/azure-pipelines.yml
index 7db802c..67b3429 100644
--- a/azure-pipelines/azure-pipelines.yml
+++ b/azure-pipelines/azure-pipelines.yml
@@ -8,7 +8,7 @@
 #
 variables:
   Config: 'RelWithDebInfo'
-  PythonVersion: '3.6'
+  PythonVersion: '3.7'
   PythonArch: 'x64'
   CmakeConfigExtraArgs: ''
   StaticLibs: yes
@@ -17,16 +17,13 @@
 - job: Windows_VS2019
   variables:
     CmakeConfigExtraArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
+    CmakeGenerator: '-G "Visual Studio 16 2019"'
+    VCPKG_DEFAULT_TRIPLET: x64-windows
   pool:
     vmImage: 'windows-2019'
   steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: $(PythonVersion)
-      addToPath: true
-      architecture: $(PythonArch)
   - script: |
-      choco install swig
+      choco install -y swig --version=4.0.1
       vcpkg install jsoncpp
       vcpkg integrate install
     name: InstallExtraStuff
@@ -35,21 +32,20 @@
   variables:
     PythonArch: 'x86'
     CmakeConfigExtraArgs: '-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
+    CmakeGenerator: '-G "Visual Studio 15 2017"'
+    VCPKG_DEFAULT_TRIPLET: x86-windows
   pool:
     vmImage: 'vs2017-win2016'
   steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: $(PythonVersion)
-      addToPath: true
-      architecture: $(PythonArch)
   - script: |
-      choco install swig
+      choco install -y swig --version=4.0.1
       vcpkg install jsoncpp
       vcpkg integrate install
     name: InstallExtraStuff
   - template: steps.yml
 - job: Ubuntu
+  variables:
+    PythonVersion: '3.8'
   pool:
     vmImage: 'ubuntu-18.04'
   steps:
@@ -58,14 +54,14 @@
   - template: steps.yml
 - job: MacOS
   variables:
+    PythonVersion: '3.6'
     PKG_CONFIG_PATH: '/usr/local/opt/openssl@1.1/lib/pkgconfig'
-    CmakeConfigExtraArgs: '-DPYTHON_EXECUTABLE=/usr/local/bin/python3 -DBUILD_RUBY=no'
+    CmakeConfigExtraArgs: '-DBUILD_RUBY=no'
   pool:
     vmImage: 'macOS-10.15'
   steps:
   - script: |
       brew update
       brew install libuv swig pkgconfig openssl@1.1 jsoncpp
-      brew upgrade python@3 python@2 || true
     name: InstallExtraStuff
   - template: steps.yml

azure-pipelines/steps.yml

diff --git a/azure-pipelines/steps.yml b/azure-pipelines/steps.yml
index 7e4c201..7944727 100644
--- a/azure-pipelines/steps.yml
+++ b/azure-pipelines/steps.yml
@@ -1,6 +1,5 @@
 steps:
 - task: UsePythonVersion@0
-  enabled: false
   inputs:
     versionSpec: $(PythonVersion)
     addToPath: true
@@ -13,7 +12,7 @@
   name: CMakeConfigure
   inputs:
     workingDirectory: 'BLD'
-    cmakeArgs: $(Build.SourcesDirectory) -DBUILD_STATIC_LIBS=$(StaticLibs) $(CmakeConfigExtraArgs)
+    cmakeArgs: $(CmakeGenerator) $(Build.SourcesDirectory) -DBUILD_STATIC_LIBS=$(StaticLibs) $(CmakeConfigExtraArgs)
 - task: CMake@1
   name: CMakeBuild
   inputs: