aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-01-12 01:14:43 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-01-20 19:43:59 -0500
commit4faf30de3ea72bd188c8894eb10f0c971ff28e90 (patch)
tree11a18838776a25696ee422d4caebc11b7f04379b
parent40cc5822b1dbd06615bcbe966fffb3a64d255462 (diff)
downloadrneovim-4faf30de3ea72bd188c8894eb10f0c971ff28e90.tar.gz
rneovim-4faf30de3ea72bd188c8894eb10f0c971ff28e90.tar.bz2
rneovim-4faf30de3ea72bd188c8894eb10f0c971ff28e90.zip
ci/Appveyor: install diffutils via scoop
scoop is a Windows package manager, similar to homebrew on OSX. It is written on powershell, works in unelevated accounts, is regularly maintained, and does not need mingw/msys2/cygwin or WSL environments. Sample use case is running (busybox) bash, which can be installed via scoop via "scoop install busybox", to use CI bash scripts in Appveyor. Parts of scoop's directory can be cached to avoid downloads. scoop modifies the registry for persistence environment variables so scoop itself cannot be cached.
-rw-r--r--ci/build.ps15
1 files changed, 3 insertions, 2 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1
index b2a4c1ec2a..afef9df6bf 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -36,7 +36,8 @@ $scoop = (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh'
Invoke-Expression $scoop
}
-scoop install nodejs-lts perl
+scoop install diffutils nodejs-lts perl
+diff3 --version
node --version
npm.cmd --version
perl --version
@@ -76,7 +77,7 @@ if ($compiler -eq 'MINGW') {
# in MSYS2, but we cannot build inside the MSYS2 shell.
$cmakeGenerator = 'Ninja'
$cmakeGeneratorArgs = '-v'
- $mingwPackages = @('ninja', 'cmake', 'diffutils').ForEach({
+ $mingwPackages = @('ninja', 'cmake').ForEach({
"mingw-w64-$arch-$_"
})