From 45b8dc0c3df861e5fa9ba67f8ac5e0993d2dba5d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 7 Mar 2020 22:37:00 -0500 Subject: [PATCH] Revert "ci/Appveyor: install diffutils via scoop" This reverts commit 4faf30de3ea72bd188c8894eb10f0c971ff28e90. --- ci/build.ps1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/build.ps1 b/ci/build.ps1 index 01cf20874e..36570be7ae 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -36,8 +36,7 @@ $scoop = (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh' Invoke-Expression $scoop } -scoop install diffutils perl -diff3 --version +scoop install perl perl --version cpanm.bat --version @@ -81,7 +80,7 @@ if ($compiler -eq 'MINGW') { # in MSYS2, but we cannot build inside the MSYS2 shell. $cmakeGenerator = 'Ninja' $cmakeGeneratorArgs = '-v' - $mingwPackages = @('ninja', 'cmake').ForEach({ + $mingwPackages = @('ninja', 'cmake', 'diffutils').ForEach({ "mingw-w64-$arch-$_" })