diff options
| -rw-r--r-- | ci/build.ps1 | 33 | ||||
| -rwxr-xr-x | ci/install.sh | 2 |
2 files changed, 15 insertions, 20 deletions
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)" } diff --git a/ci/install.sh b/ci/install.sh index 24a4bd7450..4a48a4f5d7 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -31,7 +31,6 @@ echo "Install tree-sitter npm package" # https://github.com/tree-sitter/tree-sitter/commit/e14e285a1087264a8c74a7c62fcaecc49db9d904 # If queries added to tree-sitter-c, we can use latest tree-sitter-cli npm install -g tree-sitter-cli@v0.15.9 -npm link tree-sitter-cli echo "Install tree-sitter c parser" curl "https://codeload.github.com/tree-sitter/tree-sitter-c/tar.gz/v0.15.2" -o tree_sitter_c.tar.gz @@ -48,3 +47,4 @@ else cd src/ gcc -m32 -o "$TREE_SITTER_DIR/bin/c.so" -shared parser.c -I. fi +test -f "$TREE_SITTER_DIR/bin/c.so" |