From 7b20794080b603ef37cd778d92507d5e1aa6c2fd Mon Sep 17 00:00:00 2001
From: Dmitry Kobets <dmitrykobets@microsoft.com>
Date: Wed, 8 Dec 2021 11:13:49 -0800
Subject: [PATCH] Trying MSVC LLVM

---
 azure-pipelines.yml | 64 +++------------------------------------------
 pipelines/steps.yml |  2 +-
 2 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8ab761e..1401bde 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,71 +4,15 @@ trigger:
 pr:
   autoCancel: true
 
-# GCC
+
 stages:
-- stage: GCC
-  dependsOn: []
-  variables:
-  - name: CC
-    value: gcc
-  - name: CXX
-    value: g++
-  jobs:
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate GCC latest'
-      imageName: ubuntu-20.04
-      CXXVersions: [ 14, 17 ]
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate GCC Previous'
-      imageName: ubuntu-18.04
-      CXXVersions: [ 14, 17 ]
-
-# Clang
-- stage: Clang
-  dependsOn: []
-  variables:
-  - name: CC
-    value: clang
-  - name: CXX
-    value: clang++
-  jobs:
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate Clang latest'
-      imageName: ubuntu-20.04
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate Clang Previous'
-      imageName: ubuntu-18.04
-      CXXVersions: [ 14, 17 ]
-
 # MSVC
 - stage: MSVC
   dependsOn: []
   jobs:
   - template: ./pipelines/jobs.yml
     parameters:
-      jobName: 'Validate MSVC latest'
+      jobName: 'Validate MSVC Clang'
       imageName: windows-latest
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate MSVC Previous'
-      imageName: vs2017-win2016
-      CXXVersions: [ 14, 17 ]
-
-# Apple-Clang
-- stage: Apple_Clang
-  dependsOn: []
-  jobs:
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate Apple-Clang latest'
-      imageName: macos-10.15
-      CXXVersions: [ 14, 17 ]
-  - template: ./pipelines/jobs.yml
-    parameters:
-      jobName: 'Validate Apple-Clang Previous'
-      imageName: macos-10.14
-      CXXVersions: [ 14, 17 ]
+      CXXVersions: [ 17 ]
+      buildTypes: [ 'Release' ]
diff --git a/pipelines/steps.yml b/pipelines/steps.yml
index 2e80713..dee3602 100644
--- a/pipelines/steps.yml
+++ b/pipelines/steps.yml
@@ -7,7 +7,7 @@ steps:
     name: Configure
     inputs:
       workingDirectory: build
-      cmakeArgs: '-DGSL_CXX_STANDARD=${{ parameters.CXXVersion }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCI_TESTING:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Werror=dev .. '
+      cmakeArgs: '-DGSL_CXX_STANDARD=${{ parameters.CXXVersion }} -T ClangCL -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCI_TESTING:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Werror=dev .. '
 
   - task: CMake@1
     name: Build