diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml index 0c42fdb22..5a6d34d6c 100644 --- a/ci/azure/pipelines.yml +++ b/ci/azure/pipelines.yml @@ -28,17 +28,7 @@ jobs: - job: BuildWindows pool: vmImage: 'windows-2019' - strategy: - matrix: - mingw64: - CHERE_INVOKING: yes - MSYSTEM: MINGW64 - SCRIPT: '%CD:~0,2%\msys64\usr\bin\bash -lc "bash ci/azure/windows_mingw_script"' - msvc: - SCRIPT: ci/azure/windows_msvc_script.bat - timeoutInMinutes: 360 - steps: - powershell: | (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe", "sfx.exe") @@ -57,7 +47,7 @@ jobs: - task: DownloadSecureFile@1 inputs: secureFile: s3cfg - - script: $(SCRIPT) + - script: ci/azure/windows_msvc_script.bat name: main displayName: 'Build and test' - job: OnMasterSuccess diff --git a/ci/azure/windows_mingw_script b/ci/azure/windows_mingw_script deleted file mode 100644 index 900baebee..000000000 --- a/ci/azure/windows_mingw_script +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -x -set -e - -pacman --noconfirm --needed -S git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-clang mingw-w64-x86_64-lld mingw-w64-x86_64-llvm - -git config core.abbrev 9 - -# Git is wrong for autocrlf being enabled by default on Windows. -# git is mangling files on Windows by default. -# This is the second bug I've tracked down to being caused by autocrlf. -git config core.autocrlf false -# Too late; the files are already mangled. -git checkout . - -ZIGBUILDDIR="$(pwd)/build" -PREFIX="$ZIGBUILDDIR/dist" -CMAKEFLAGS="-DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX -DZIG_STATIC=ON" - -mkdir $ZIGBUILDDIR -cd $ZIGBUILDDIR - -cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo $CMAKEFLAGS -DCMAKE_EXE_LINKER_FLAGS='-fuse-ld=lld -Wl,/debug,/pdb:zig.pdb' - -make -j$(nproc) install - -./zig build test-behavior -Dskip-non-native -Dskip-release