From da34d395776d0036fb18676a3f87a01dde248789 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 28 Jul 2023 13:12:49 -0400
Subject: [PATCH] Revert "CI attempt cross-compile on macOS"

This reverts commit bc559184b023a22dac1cbad4bcf1cb637177ba5d.
---
 azure-pipelines.yml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 37219dd28..c7792e39d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,10 +24,6 @@ strategy:
       imageName: 'macOS-13'
       toolchainName: clang
       buildTargetName: all
-    macOS_Ventura_cross_msdos:
-      imageName: 'macOS-13'
-      toolchainName: cross
-      buildTargetName: msdos
     windows-visualstudio:
       imageName: 'windows-latest'
       toolchainName: vs
@@ -37,7 +33,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:
@@ -234,20 +230,6 @@ steps:
   workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
   displayName: 'Building mac full build'
 
-- bash: |
-    cd sys/unix
-    sh setup.sh hints/macos.370
-    cd ../..
-    make fetch-lua
-    sh sys/msdos/fetch-cross-compiler.sh
-    retVal=$?
-    if [ $retVal -eq 0 ]; then
-        make LUA_VERSION=5.4.6 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
-    fi
-  condition: eq( variables['Agent.OS'], 'Darwin' ), eq( variables.toolchain, 'cross'))
-  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
-  displayName: 'Building MSDOS package on macOS'
-
 - bash: |
     export GCCVER=gcc1220
     cd sys/unix
@@ -261,7 +243,7 @@ steps:
     fi
   condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
   workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
-  displayName: 'Building MSDOS package on Linux'
+  displayName: 'Building MSDOS build'
 - bash: |
     sudo apt-get install texlive
     make Guidebook