Revert "CI attempt cross-compile on macOS"
This reverts commit bc559184b0.
This commit is contained in:
+2
-20
@@ -24,10 +24,6 @@ strategy:
|
|||||||
imageName: 'macOS-13'
|
imageName: 'macOS-13'
|
||||||
toolchainName: clang
|
toolchainName: clang
|
||||||
buildTargetName: all
|
buildTargetName: all
|
||||||
macOS_Ventura_cross_msdos:
|
|
||||||
imageName: 'macOS-13'
|
|
||||||
toolchainName: cross
|
|
||||||
buildTargetName: msdos
|
|
||||||
windows-visualstudio:
|
windows-visualstudio:
|
||||||
imageName: 'windows-latest'
|
imageName: 'windows-latest'
|
||||||
toolchainName: vs
|
toolchainName: vs
|
||||||
@@ -37,7 +33,7 @@ strategy:
|
|||||||
toolchainName: mingw
|
toolchainName: mingw
|
||||||
buildTargetName: all
|
buildTargetName: all
|
||||||
linux_focal_cross_msdos:
|
linux_focal_cross_msdos:
|
||||||
imageName: 'ubuntu-20.04'
|
imageName: 'ubuntu-22.04'
|
||||||
toolchainName: cross
|
toolchainName: cross
|
||||||
buildTargetName: msdos
|
buildTargetName: msdos
|
||||||
linux_jammy_docs:
|
linux_jammy_docs:
|
||||||
@@ -234,20 +230,6 @@ steps:
|
|||||||
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
|
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
|
||||||
displayName: 'Building mac full build'
|
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: |
|
- bash: |
|
||||||
export GCCVER=gcc1220
|
export GCCVER=gcc1220
|
||||||
cd sys/unix
|
cd sys/unix
|
||||||
@@ -261,7 +243,7 @@ steps:
|
|||||||
fi
|
fi
|
||||||
condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
|
condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
|
||||||
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
|
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
|
||||||
displayName: 'Building MSDOS package on Linux'
|
displayName: 'Building MSDOS build'
|
||||||
- bash: |
|
- bash: |
|
||||||
sudo apt-get install texlive
|
sudo apt-get install texlive
|
||||||
make Guidebook
|
make Guidebook
|
||||||
|
|||||||
Reference in New Issue
Block a user