From 09b19aa4d0ce1c2848263a927838000dcfbc4c37 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 28 Jul 2023 11:36:31 -0400
Subject: [PATCH] some CI updates

---
 azure-pipelines.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 98b898f6e..9e3620d0e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,28 +4,28 @@ strategy:
       imageName: 'ubuntu-latest'
       toolchainName: gcc9
       buildTargetName: minimal
-    linux_focal_clang_all:
-      imageName: 'ubuntu-20.04'
+    linux_jammy_clang_all:
+      imageName: 'ubuntu-22.04'
       toolchainName: clang
       buildTargetName: all
-    linux_focal_gcc9_all:
-      imageName: 'ubuntu-20.04'
+    linux_jammy_gcc9_all:
+      imageName: 'ubuntu-22.04'
       toolchainName: gcc9
       buildTargetName: all
-    linux_focal_gcc10_all:
-      imageName: 'ubuntu-20.04'
-      toolchainName: gcc10
-      buildTargetName: all
-    linux_jammy_gcc11_all:
+    linux_jammy_gcc12_all:
       imageName: 'ubuntu-22.04'
-      toolchainName: gcc11
+      toolchainName: gcc12
+      buildTargetName: all
+    linux_jammy_gcc12_all:
+      imageName: 'ubuntu-22.04'
+      toolchainName: gcc12
       buildTargetName: all
     macOS_latest_clang_all:
       imageName: 'macOS-latest'
       toolchainName: clang
       buildTargetName: all
-    macOS_monterey_clang13_all:
-      imageName: 'macOS-12'
+    macOS_Ventura_clang13_all:
+      imageName: 'macOS-13'
       toolchainName: clang
       buildTargetName: all
     windows-visualstudio:
@@ -37,7 +37,7 @@ strategy:
       toolchainName: mingw
       buildTargetName: all
     linux_focal_cross_msdos:
-      imageName: 'ubuntu-20.04'
+      imageName: 'ubuntu-22.04'
       toolchainName: cross
       buildTargetName: msdos
     linux_jammy_docs:
@@ -84,6 +84,11 @@ steps:
       echo "##vso[task.setvariable variable=CC]gcc-11"
       echo "##vso[task.setvariable variable=CXX]g++-11"
     fi
+    if [ "$(toolchain)" == "gcc12" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-12"
+      echo "##vso[task.setvariable variable=CXX]g++-12"
+    fi
     if [ "$(toolchain)" == "clang" ]
     then
       echo "##vso[task.setvariable variable=CC]clang"