From 6809e0a673a1d93e2d7239bec63f16bd5368aebc Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian@gmail.com>
Date: Sat, 18 Apr 2020 14:16:41 -0400
Subject: [PATCH] Change Azure OSX image

---
 .azure-pipelines.yml | 104 ++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 66 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 3b11c07..f976de3 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -193,11 +193,6 @@ stages:
           #B2_CXXSTD: 14 # default
           B2_ADDRESS_MODEL: address-model=64,32
           VM_IMAGE: 'vs2017-win2016'
-        VS 2015 C++14:
-          B2_TOOLSET: msvc-14.0
-          #B2_CXXSTD: 14 # default
-          B2_ADDRESS_MODEL: address-model=64,32
-          VM_IMAGE: 'vs2015-win2012r2'
 
     pool:
       vmImage: $(VM_IMAGE)
@@ -225,80 +220,57 @@ stages:
 
   - job: 'macOS'
     pool:
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
     strategy:
       matrix:
-        Xcode 10.1:
+        Xcode_11_3_1:
           B2_TOOLSET: clang
-          B2_CXXSTD: 14,17
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.3.1.app
+        Xcode_11_2_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.2.1.app
+        Xcode_11_2:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.2.app
+        Xcode_11_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.1.app
+        Xcode_10_3:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.3.app
+        Xcode_10_2_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.2.1.app
+        Xcode_10_2:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.2.app
+        Xcode_10_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
           XCODE_APP: /Applications/Xcode_10.1.app
-        Xcode 10.0:
+        Xcode_10_0:
           B2_TOOLSET: clang
-          B2_CXXSTD: 14,17
+          B2_CXXSTD: 11,14,17,2a
           XCODE_APP: /Applications/Xcode_10.app
-        Xcode 9.4.1:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11,14,17
-          XCODE_APP: /Applications/Xcode_9.4.1.app
-        Xcode 9.4:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11,14,17
-          XCODE_APP: /Applications/Xcode_9.4.app
-        Xcode 9.3.1:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11,14,17
-          XCODE_APP: /Applications/Xcode_9.3.1.app
-        Xcode 9.3:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11,14
-          XCODE_APP: /Applications/Xcode_9.3.app
-        Xcode 9.2:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11,14
-          XCODE_APP: /Applications/Xcode_9.2.app
-        Xcode 9.1:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11
-          XCODE_APP: /Applications/Xcode_9.1.app
-        Xcode 9.0.1:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11
-          XCODE_APP: /Applications/Xcode_9.0.1.app
-        Xcode 9.0:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11
-          XCODE_APP: /Applications/Xcode_9.app
-        Xcode 8.3.3:
-          B2_TOOLSET: clang
-          B2_CXXSTD: 11
-          XCODE_APP: /Applications/Xcode_8.3.3.app
     steps:
     - bash: |
         set -e
-        uname -a
-        sudo xcode-select -switch ${XCODE_APP}
-        which clang++
-
-        git clone --branch master https://github.com/boostorg/boost-ci.git boost-ci
-        cp -pr boost-ci/ci boost-ci/.codecov.yml .
-        rm -rf boost-ci
+        git clone --branch master https://github.com/boostorg/boost-ci.git boost-ci-cloned
+        cp -prf boost-ci-cloned/ci .
+        rm -rf boost-ci-cloned
         source ci/azure-pipelines/install.sh
-
-        # AzP requires to run special task in order to export
-        # SELF and BOOST_ROOT as job-scoped variable from a script.
-        # NOTE: Disable set -x is necessary, see the troubleshooting guide
-        # on "Variables having ' (single quote) appended":
-        # https://docs.microsoft.com/en-us/azure/devops/pipelines/troubleshooting
-        set +x
-        echo "##vso[task.setvariable variable=SELF]"$SELF
-        echo "##vso[task.setvariable variable=BOOST_ROOT]"$BOOST_ROOT
-        set -x
       displayName: Install
     - bash: |
         set -e
         echo "SELF=$SELF"
         echo "BOOST_ROOT=$BOOST_ROOT"
-
         cd $BOOST_ROOT/libs/$SELF
-        ci/azure-pipelines/build.sh --debug-configuration
-      displayName: 'Build'
+        ci/azure-pipelines/build.sh
+      displayName: 'Build'
\ No newline at end of file