From 4ea5e63aa8c866b4fcc9d10f1a26078d2517f96a Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sun, 9 Jun 2019 13:26:48 +0200
Subject: tree-sitter: add basic testing on ci

build tree-sitter c parser on ci for testing purposes
---
 ci/build.ps1 | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index d533d7b4e0..4e1a69376b 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -94,6 +94,28 @@ npm.cmd install -g neovim
 Get-Command -CommandType Application neovim-node-host.cmd
 npm.cmd link neovim
 
+#npm.cmd install -g tree-sitter-cli
+#npm.cmd link tree-sitter-cli
+
+mkdir c:\treesitter
+$env:TREE_SITTER_DIR = "c:\treesitter"
+#$env:PATH = "c:\treesitter;$env:PATH"
+$client = new-object System.Net.WebClient
+cd c:\treesitter
+
+if ($bits -eq 32) {
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.5/tree-sitter-windows-x86.gz","c:\treesitter\tree-sitter-cli.gz")
+}
+elseif ($bits -eq 64) {
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.5/tree-sitter-windows-x64.gz","c:\treesitter\tree-sitter-cli.gz")
+}
+python -c "import gzip, shutil; f1,f2 = gzip.open('tree-sitter-cli.gz', 'rb'),  open('tree-sitter.exe', 'wb'); shutil.copyfileobj(f1, f2); f2.close()"
+
+$client.DownloadFile("https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2","c:\treesitter\tree_sitter_c.zip")
+Expand-Archive c:\treesitter\tree_sitter_c.zip -DestinationPath c:\treesitter\
+cd c:\treesitter\tree-sitter-c-0.15.2
+c:\treesitter\tree-sitter.exe test
+
 function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }
-- 
cgit 


From 7a3602378fafc426dcefc3b94f75467d4df12d24 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 4 Oct 2019 16:23:48 +0200
Subject: ci: upgrade tree-sitter from 0.15.2 to 0.15.9

tree-sitter-c is still at 0.15.2 though.
---
 ci/build.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 4e1a69376b..0a533e9d07 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -104,10 +104,10 @@ $client = new-object System.Net.WebClient
 cd c:\treesitter
 
 if ($bits -eq 32) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.5/tree-sitter-windows-x86.gz","c:\treesitter\tree-sitter-cli.gz")
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x86.gz","c:\treesitter\tree-sitter-cli.gz")
 }
 elseif ($bits -eq 64) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.5/tree-sitter-windows-x64.gz","c:\treesitter\tree-sitter-cli.gz")
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x64.gz","c:\treesitter\tree-sitter-cli.gz")
 }
 python -c "import gzip, shutil; f1,f2 = gzip.open('tree-sitter-cli.gz', 'rb'),  open('tree-sitter.exe', 'wb'); shutil.copyfileobj(f1, f2); f2.close()"
 
-- 
cgit 


From e9b420dba5119536558f659d598546176d77070e Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 4 Oct 2019 16:26:26 +0200
Subject: lint

---
 ci/build.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 0a533e9d07..07da6c4e19 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -104,12 +104,12 @@ $client = new-object System.Net.WebClient
 cd c:\treesitter
 
 if ($bits -eq 32) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x86.gz","c:\treesitter\tree-sitter-cli.gz")
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x86.gz", "c:\treesitter\tree-sitter-cli.gz")
 }
 elseif ($bits -eq 64) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x64.gz","c:\treesitter\tree-sitter-cli.gz")
+  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x64.gz", "c:\treesitter\tree-sitter-cli.gz")
 }
-python -c "import gzip, shutil; f1,f2 = gzip.open('tree-sitter-cli.gz', 'rb'),  open('tree-sitter.exe', 'wb'); shutil.copyfileobj(f1, f2); f2.close()"
+python -c "import gzip, shutil; f1,f2 = gzip.open('tree-sitter-cli.gz', 'rb'), open('tree-sitter.exe', 'wb'); shutil.copyfileobj(f1, f2); f2.close()"
 
 $client.DownloadFile("https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2","c:\treesitter\tree_sitter_c.zip")
 Expand-Archive c:\treesitter\tree_sitter_c.zip -DestinationPath c:\treesitter\
-- 
cgit 


From db9f68f98d9cebf372c83a9c512499e8388c884a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 9 Oct 2019 03:07:42 +0200
Subject: ci: AppVeyor: coverage for Lua (Windows) (#10426)

---
 ci/build.ps1 | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 07da6c4e19..6d91b97aed 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -46,6 +46,10 @@ if ($compiler -eq 'MINGW') {
     $nvimCmakeVars['USE_GCOV'] = 'ON'
     $uploadToCodecov = $true
     $env:GCOV = "C:\msys64\mingw$bits\bin\gcov"
+
+    # Setup/build Lua coverage.
+    $env:USE_LUACOV = 1
+    $env:BUSTED_ARGS = "--coverage"
   }
   # These are native MinGW builds, but they use the toolchain inside
   # MSYS2, this allows using all the dependencies and tools available
@@ -135,6 +139,10 @@ cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
 # Ensure that the "win32" feature is set.
 .\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed
 
+if ($env:USE_LUACOV -eq 1) {
+  & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
+}
+
 # Functional tests
 # The $LastExitCode from MSBuild can't be trusted
 $failed = $false
@@ -143,18 +151,17 @@ Set-PSDebug -Off
 cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
   foreach { $failed = $failed -or
     $_ -match 'functional tests failed with error'; $_ }
-if ($failed) {
-  if ($uploadToCodecov) {
-    bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
-  }
-  exit $LastExitCode
-}
-Set-PSDebug -Strict -Trace 1
-
 
 if ($uploadToCodecov) {
+  if ($env:USE_LUACOV -eq 1) {
+    & $env:DEPS_PREFIX\bin\luacov.bat
+  }
   bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
 }
+if ($failed) {
+  exit $LastExitCode
+}
+Set-PSDebug -Strict -Trace 1
 
 # Old tests
 # Add MSYS to path, required for e.g. `find` used in test scripts.
-- 
cgit 


From 9b22b69454de45d37ae0bd5ebbefa8538d36197f Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Tue, 22 Oct 2019 20:28:56 -0400
Subject: CI/Appveyor: set powershell strict mode

Set-PSDebug produces too much noise and has global scope.
Strict mode is scoped to the script context and catches errors.
---
 ci/build.ps1 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 6d91b97aed..8f7fdd5f59 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,10 +1,10 @@
+Set-StrictMode -Version Latest
 $ErrorActionPreference = 'stop'
-Set-PSDebug -Strict -Trace 1
 
 $isPullRequest = ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne $null)
 $env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
 $compiler = $Matches.compiler
-$compileOption = $Matches.option
+$compileOption = if ($Matches -contains 'option') {$Matches.option} else {''}
 $bits = $Matches.bits
 $cmakeBuildType = $(if ($env:CMAKE_BUILD_TYPE -ne $null) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
 $buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
@@ -23,7 +23,6 @@ $uploadToCodeCov = $false
 
 function exitIfFailed() {
   if ($LastExitCode -ne 0) {
-    Set-PSDebug -Off
     exit $LastExitCode
   }
 }
@@ -146,8 +145,6 @@ if ($env:USE_LUACOV -eq 1) {
 # Functional tests
 # The $LastExitCode from MSBuild can't be trusted
 $failed = $false
-# Temporarily turn off tracing to reduce log file output
-Set-PSDebug -Off
 cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
   foreach { $failed = $failed -or
     $_ -match 'functional tests failed with error'; $_ }
@@ -161,7 +158,6 @@ if ($uploadToCodecov) {
 if ($failed) {
   exit $LastExitCode
 }
-Set-PSDebug -Strict -Trace 1
 
 # Old tests
 # Add MSYS to path, required for e.g. `find` used in test scripts.
-- 
cgit 


From ec205f4b9b926a17b3211495ec6468db8b80aa6a Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 20 Oct 2019 22:30:31 -0400
Subject: ci: simplify tree-sitter-cli install

Remove useless `npm link` for tree-sitter-cli.
Use powershell builtins.
---
 ci/build.ps1 | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 8f7fdd5f59..49fd61abf6 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,5 +1,6 @@
 Set-StrictMode -Version Latest
-$ErrorActionPreference = 'stop'
+$ErrorActionPreference = 'Stop'
+$ProgressPreference = 'SilentlyContinue'
 
 $isPullRequest = ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne $null)
 $env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
@@ -97,27 +98,21 @@ npm.cmd install -g neovim
 Get-Command -CommandType Application neovim-node-host.cmd
 npm.cmd link neovim
 
-#npm.cmd install -g tree-sitter-cli
-#npm.cmd link tree-sitter-cli
 
-mkdir c:\treesitter
-$env:TREE_SITTER_DIR = "c:\treesitter"
-#$env:PATH = "c:\treesitter;$env:PATH"
-$client = new-object System.Net.WebClient
-cd c:\treesitter
+$env:TREE_SITTER_DIR = $env:USERPROFILE + "\tree-sitter-build"
+mkdir "$env:TREE_SITTER_DIR\bin"
 
-if ($bits -eq 32) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x86.gz", "c:\treesitter\tree-sitter-cli.gz")
-}
-elseif ($bits -eq 64) {
-  $client.DownloadFile("https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-x64.gz", "c:\treesitter\tree-sitter-cli.gz")
-}
-python -c "import gzip, shutil; f1,f2 = gzip.open('tree-sitter-cli.gz', 'rb'), open('tree-sitter.exe', 'wb'); shutil.copyfileobj(f1, f2); f2.close()"
+$xbits = if ($bits -eq '32') {'x86'} else {'x64'}
+Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-$xbits.gz" -OutFile tree-sitter.exe.gz
+C:\msys64\usr\bin\gzip -d tree-sitter.exe.gz
 
-$client.DownloadFile("https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2","c:\treesitter\tree_sitter_c.zip")
-Expand-Archive c:\treesitter\tree_sitter_c.zip -DestinationPath c:\treesitter\
-cd c:\treesitter\tree-sitter-c-0.15.2
-c:\treesitter\tree-sitter.exe test
+Invoke-WebRequest -UseBasicParsing -Uri "https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2" -OutFile tree_sitter_c.zip
+Expand-Archive .\tree_sitter_c.zip -DestinationPath .
+cd tree-sitter-c-0.15.2
+..\tree-sitter.exe test
+if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
+  exit 1
+}
 
 function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
-- 
cgit 


From 629ea19994d832a7de806e451941dd4904bcc5ed Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 19 Nov 2019 19:10:30 +0100
Subject: deps: upgrade bundled LuaRocks: 2.4.4 => 3.2.1 (#10292)

Changelog: https://github.com/luarocks/luarocks/compare/v2.4.4..v3.2.1#diff-4ac32a78649ca5bdd8e0ba38b7006a1e
---
 ci/build.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 49fd61abf6..244b4766b2 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -114,6 +114,11 @@ if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
   exit 1
 }
 
+if ($compiler -eq 'MSVC') {
+  # Required for LuaRocks (https://github.com/luarocks/luarocks/issues/1039#issuecomment-507296940).
+  $env:VCINSTALLDIR = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/"
+}
+
 function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }
-- 
cgit 


From 2c62b2fc56b6b86a930356ccf48ba8fb189a7654 Mon Sep 17 00:00:00 2001
From: KillTheMule <KillTheMule@users.noreply.github.com>
Date: Thu, 2 Jan 2020 14:52:18 +0100
Subject: build.ps1: add "-NoTests" param #11654

---
 ci/build.ps1 | 118 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 62 insertions(+), 56 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 244b4766b2..524dabdf3e 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,3 +1,4 @@
+param([switch]$NoTests)
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
@@ -80,38 +81,41 @@ elseif ($compiler -eq 'MSVC') {
   }
 }
 
-# Setup python (use AppVeyor system python)
-C:\Python27\python.exe -m pip install pynvim ; exitIfFailed
-C:\Python35\python.exe -m pip install pynvim ; exitIfFailed
-# Disambiguate python3
-move c:\Python35\python.exe c:\Python35\python3.exe
-$env:PATH = "C:\Python35;C:\Python27;$env:PATH"
-# Sanity check
-python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
-python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed
-
-$env:PATH = "C:\Ruby24\bin;$env:PATH"
-gem.cmd install neovim
-Get-Command -CommandType Application neovim-ruby-host.bat
-
-npm.cmd install -g neovim
-Get-Command -CommandType Application neovim-node-host.cmd
-npm.cmd link neovim
-
-
-$env:TREE_SITTER_DIR = $env:USERPROFILE + "\tree-sitter-build"
-mkdir "$env:TREE_SITTER_DIR\bin"
-
-$xbits = if ($bits -eq '32') {'x86'} else {'x64'}
-Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-$xbits.gz" -OutFile tree-sitter.exe.gz
-C:\msys64\usr\bin\gzip -d tree-sitter.exe.gz
-
-Invoke-WebRequest -UseBasicParsing -Uri "https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2" -OutFile tree_sitter_c.zip
-Expand-Archive .\tree_sitter_c.zip -DestinationPath .
-cd tree-sitter-c-0.15.2
-..\tree-sitter.exe test
-if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
-  exit 1
+if (-not $NoTests) {
+  # Setup python (use AppVeyor system python)
+  C:\Python27\python.exe -m pip install pynvim ; exitIfFailed
+  C:\Python35\python.exe -m pip install pynvim ; exitIfFailed
+  # Disambiguate python3
+  move c:\Python35\python.exe c:\Python35\python3.exe
+  $env:PATH = "C:\Python35;C:\Python27;$env:PATH"
+  # Sanity check
+  python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+  python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+
+  $env:PATH = "C:\Ruby24\bin;$env:PATH"
+  gem.cmd install neovim
+  Get-Command -CommandType Application neovim-ruby-host.bat
+
+  npm.cmd install -g neovim
+  Get-Command -CommandType Application neovim-node-host.cmd
+  npm.cmd link neovim
+
+
+  $env:TREE_SITTER_DIR = $env:USERPROFILE + "\tree-sitter-build"
+  mkdir "$env:TREE_SITTER_DIR\bin"
+
+  $xbits = if ($bits -eq '32') {'x86'} else {'x64'}
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-$xbits.gz" -OutFile tree-sitter.exe.gz
+  C:\msys64\usr\bin\gzip -d tree-sitter.exe.gz
+
+  Invoke-WebRequest -UseBasicParsing -Uri "https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2" -OutFile tree_sitter_c.zip
+  Expand-Archive .\tree_sitter_c.zip -DestinationPath .
+  cd tree-sitter-c-0.15.2
+  ..\tree-sitter.exe test
+  if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
+    exit 1
+  }
+
 }
 
 if ($compiler -eq 'MSVC') {
@@ -142,33 +146,35 @@ if ($env:USE_LUACOV -eq 1) {
   & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
 }
 
-# Functional tests
-# The $LastExitCode from MSBuild can't be trusted
-$failed = $false
-cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
-  foreach { $failed = $failed -or
-    $_ -match 'functional tests failed with error'; $_ }
-
-if ($uploadToCodecov) {
-  if ($env:USE_LUACOV -eq 1) {
-    & $env:DEPS_PREFIX\bin\luacov.bat
+if (-not $NoTests) {
+  # Functional tests
+  # The $LastExitCode from MSBuild can't be trusted
+  $failed = $false
+  cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
+    foreach { $failed = $failed -or
+      $_ -match 'functional tests failed with error'; $_ }
+
+  if ($uploadToCodecov) {
+    if ($env:USE_LUACOV -eq 1) {
+      & $env:DEPS_PREFIX\bin\luacov.bat
+    }
+    bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
+  }
+  if ($failed) {
+    exit $LastExitCode
   }
-  bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
-}
-if ($failed) {
-  exit $LastExitCode
-}
 
-# Old tests
-# Add MSYS to path, required for e.g. `find` used in test scripts.
-# But would break functionaltests, where its `more` would be used then.
-$OldPath = $env:PATH
-$env:PATH = "C:\msys64\usr\bin;$env:PATH"
-& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
-$env:PATH = $OldPath
+  # Old tests
+  # Add MSYS to path, required for e.g. `find` used in test scripts.
+  # But would break functionaltests, where its `more` would be used then.
+  $OldPath = $env:PATH
+  $env:PATH = "C:\msys64\usr\bin;$env:PATH"
+  & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
+  $env:PATH = $OldPath
 
-if ($uploadToCodecov) {
-  bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
+  if ($uploadToCodecov) {
+    bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
+  }
 }
 
 # Build artifacts
-- 
cgit 


From 40cc5822b1dbd06615bcbe966fffb3a64d255462 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 11 Jan 2020 13:04:35 -0500
Subject: ci: install perl provider

---
 ci/build.ps1 | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 524dabdf3e..b2a4c1ec2a 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -29,6 +29,25 @@ function exitIfFailed() {
   }
 }
 
+# https://github.com/lukesampson/scoop#installation
+$scoop = (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+& {
+  Set-StrictMode -Off
+  Invoke-Expression $scoop
+}
+
+scoop install nodejs-lts perl
+node --version
+npm.cmd --version
+perl --version
+cpanm.bat --version
+
+cpanm.bat -n Neovim::Ext
+if ($LastExitCode -ne 0) {
+  Get-Content -Path "$env:USERPROFILE\.cpanm\build.log"
+}
+perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'; exitIfFailed
+
 if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) {
   write-host "cache dir not found: $($env:DEPS_BUILD_DIR)"
   mkdir $env:DEPS_BUILD_DIR
@@ -57,7 +76,7 @@ if ($compiler -eq 'MINGW') {
   # in MSYS2, but we cannot build inside the MSYS2 shell.
   $cmakeGenerator = 'Ninja'
   $cmakeGeneratorArgs = '-v'
-  $mingwPackages = @('ninja', 'cmake', 'perl', 'diffutils').ForEach({
+  $mingwPackages = @('ninja', 'cmake', 'diffutils').ForEach({
     "mingw-w64-$arch-$_"
   })
 
@@ -115,7 +134,6 @@ if (-not $NoTests) {
   if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
     exit 1
   }
-
 }
 
 if ($compiler -eq 'MSVC') {
-- 
cgit 


From 4faf30de3ea72bd188c8894eb10f0c971ff28e90 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 12 Jan 2020 01:14:43 -0500
Subject: 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.
---
 ci/build.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ci/build.ps1')

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-$_"
   })
 
-- 
cgit 


From b4e4ed844a25aa0ec43404e4ec318d0b54e0e1dd Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Mon, 20 Jan 2020 19:49:48 -0500
Subject: ci/Appveyor: respect -NoTest param

Skips nodejs and Neovim::Ext.
---
 ci/build.ps1 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index afef9df6bf..627dc69e88 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -36,18 +36,22 @@ $scoop = (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh'
   Invoke-Expression $scoop
 }
 
-scoop install diffutils nodejs-lts perl
+scoop install diffutils perl
 diff3 --version
-node --version
-npm.cmd --version
 perl --version
 cpanm.bat --version
 
-cpanm.bat -n Neovim::Ext
-if ($LastExitCode -ne 0) {
-  Get-Content -Path "$env:USERPROFILE\.cpanm\build.log"
+if (-not $NoTests) {
+  scoop install nodejs-lts
+  node --version
+  npm.cmd --version
+
+  cpanm.bat -n Neovim::Ext
+  if ($LastExitCode -ne 0) {
+    Get-Content -Path "$env:USERPROFILE\.cpanm\build.log"
+  }
+  perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'; exitIfFailed
 }
-perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'; exitIfFailed
 
 if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) {
   write-host "cache dir not found: $($env:DEPS_BUILD_DIR)"
-- 
cgit 


From 1c3ca4f18fdc403813d8959b49626ac1c99e2c59 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 26 Jan 2020 14:26:01 -0800
Subject: mksession: always unix slashes "/" for filepaths

---
 ci/build.ps1 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 627dc69e88..a7a456f67a 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -173,6 +173,9 @@ if (-not $NoTests) {
   # Functional tests
   # The $LastExitCode from MSBuild can't be trusted
   $failed = $false
+
+  # Run only this test file:
+  # $env:TEST_FILE = "test\functional\foo.lua"
   cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
     foreach { $failed = $failed -or
       $_ -match 'functional tests failed with error'; $_ }
-- 
cgit 


From 00c57c98dfb2df58875a3d9ad8fc557ec9a24cba Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sat, 25 Jan 2020 13:43:41 +0100
Subject: treesitter: add standard &rtp/parser/ search path for parsers

---
 ci/build.ps1 | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'ci/build.ps1')

diff --git a/ci/build.ps1 b/ci/build.ps1
index a7a456f67a..01cf20874e 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -123,22 +123,6 @@ if (-not $NoTests) {
   npm.cmd install -g neovim
   Get-Command -CommandType Application neovim-node-host.cmd
   npm.cmd link neovim
-
-
-  $env:TREE_SITTER_DIR = $env:USERPROFILE + "\tree-sitter-build"
-  mkdir "$env:TREE_SITTER_DIR\bin"
-
-  $xbits = if ($bits -eq '32') {'x86'} else {'x64'}
-  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/tree-sitter/tree-sitter/releases/download/0.15.9/tree-sitter-windows-$xbits.gz" -OutFile tree-sitter.exe.gz
-  C:\msys64\usr\bin\gzip -d tree-sitter.exe.gz
-
-  Invoke-WebRequest -UseBasicParsing -Uri "https://codeload.github.com/tree-sitter/tree-sitter-c/zip/v0.15.2" -OutFile tree_sitter_c.zip
-  Expand-Archive .\tree_sitter_c.zip -DestinationPath .
-  cd tree-sitter-c-0.15.2
-  ..\tree-sitter.exe test
-  if (-Not (Test-Path -PathType Leaf "$env:TREE_SITTER_DIR\bin\c.dll")) {
-    exit 1
-  }
 }
 
 if ($compiler -eq 'MSVC') {
-- 
cgit 


From 45b8dc0c3df861e5fa9ba67f8ac5e0993d2dba5d Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 7 Mar 2020 22:37:00 -0500
Subject: Revert "ci/Appveyor: install diffutils via scoop"

This reverts commit 4faf30de3ea72bd188c8894eb10f0c971ff28e90.
---
 ci/build.ps1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ci/build.ps1')

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-$_"
   })
 
-- 
cgit