From 4cbd4165a8968ca73baf9f3a3691d111ed7a9799 Mon Sep 17 00:00:00 2001
From: Dmitry Kobets <dmitrykobets@microsoft.com>
Date: Mon, 29 Nov 2021 11:46:45 -0800
Subject: [PATCH] Enable C++20 tests in CI

---
 pipelines/jobs.yml  | 8 ++++++++
 pipelines/steps.yml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pipelines/jobs.yml b/pipelines/jobs.yml
index dad2414..3025fdc 100644
--- a/pipelines/jobs.yml
+++ b/pipelines/jobs.yml
@@ -11,16 +11,24 @@ jobs:
     matrix:
       14_debug:
         GSL_CXX_STANDARD: '14'
+        CMAKE_CXX_STANDARD: '14'
         BUILD_TYPE: 'Debug'
       14_release:
         GSL_CXX_STANDARD: '14'
+        CMAKE_CXX_STANDARD: '14'
         BUILD_TYPE: 'Release'
       17_debug:
         GSL_CXX_STANDARD: '17'
+        CMAKE_CXX_STANDARD: '17'
         BUILD_TYPE: 'Debug'
       17_release:
         GSL_CXX_STANDARD: '17'
+        CMAKE_CXX_STANDARD: '17'
         BUILD_TYPE: 'Release'
+      20_debug:
+        GSL_CXX_STANDARD: '17'
+        CMAKE_CXX_STANDARD: '20'
+        BUILD_TYPE: 'Debug'
   continueOnError: false
   steps:
   - template: ./steps.yml
diff --git a/pipelines/steps.yml b/pipelines/steps.yml
index 41a7fca..6cc089b 100644
--- a/pipelines/steps.yml
+++ b/pipelines/steps.yml
@@ -3,7 +3,7 @@ steps:
     name: Configure
     inputs:
       workingDirectory: build
-      cmakeArgs: '-DCMAKE_CXX_STANDARD=$(GSL_CXX_STANDARD) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -Werror=dev .. '
+      cmakeArgs: '-DCMAKE_CXX_STANDARD=$(CMAKE_CXX_STANDARD) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -Werror=dev .. '
 
   - task: CMake@1
     name: Build