diff options
Diffstat (limited to 'ci')
-rw-r--r-- | ci/build.ps1 | 16 | ||||
-rwxr-xr-x | ci/install.sh | 24 | ||||
-rwxr-xr-x | ci/run_tests.sh | 2 |
3 files changed, 1 insertions, 41 deletions
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') { diff --git a/ci/install.sh b/ci/install.sh index b3ec9e7f65..769f00c5ba 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -27,29 +27,5 @@ nvm use 10 npm install -g neovim npm link neovim -echo "Install tree-sitter npm package" - -# FIXME -# 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 - -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 -tar xf tree_sitter_c.tar.gz -cd tree-sitter-c-0.15.2 -export TREE_SITTER_DIR=$HOME/tree-sitter-build/ -mkdir -p "$TREE_SITTER_DIR/bin" - -if [[ "$BUILD_32BIT" != "ON" ]]; then - # builds c parser in $HOME/tree-sitter-build/bin/c.(so|dylib) - tree-sitter test -else - # no tree-sitter binary for 32bit linux, so fake it (no tree-sitter unit tests) - cd src/ - gcc -m32 -o "$TREE_SITTER_DIR/bin/c.so" -shared parser.c -I. -fi -test -f "$TREE_SITTER_DIR/bin/c.so" - sudo cpanm -n Neovim::Ext || cat "$HOME/.cpanm/build.log" perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION' diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 97f380b7b9..d91ac5589e 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -19,7 +19,7 @@ exit_suite --continue source ~/.nvm/nvm.sh nvm use 10 -export TREE_SITTER_DIR=$HOME/tree-sitter-build/ + enter_suite tests |