From 4ea5e63aa8c866b4fcc9d10f1a26078d2517f96a Mon Sep 17 00:00:00 2001 From: Björn Linse 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/install.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index cda9a11f08..b96cf3c073 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -24,3 +24,23 @@ gem install --no-document --version ">= 0.8.0" neovim echo "Install neovim npm package" npm install -g neovim npm link neovim + +echo "Install tree-sitter npm package" +npm install -g tree-sitter-cli +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 +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 -- cgit From e9b420dba5119536558f659d598546176d77070e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 4 Oct 2019 16:26:26 +0200 Subject: lint --- ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index b96cf3c073..21175f63e0 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -34,7 +34,7 @@ curl "https://codeload.github.com/tree-sitter/tree-sitter-c/tar.gz/v0.15.2" -o t 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 +mkdir -p "$TREE_SITTER_DIR/bin" if [[ "$BUILD_32BIT" != "ON" ]]; then # builds c parser in $HOME/tree-sitter-build/bin/c.(so|dylib) @@ -42,5 +42,5 @@ if [[ "$BUILD_32BIT" != "ON" ]]; then 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. + gcc -m32 -o "$TREE_SITTER_DIR/bin/c.so" -shared parser.c -I. fi -- cgit From 02393a0c74d3aaeece939bafa4f658763acca965 Mon Sep 17 00:00:00 2001 From: Hirokazu Hata Date: Mon, 21 Oct 2019 14:53:00 +0900 Subject: ci/install.sh: pin treesitter to v0.15.9 #11266 When "tree-sitter test" is executed, query test is also executed, but "tree-sitter-c" does not have query test yet, so cli version that does not include query test execution To use. ref https://github.com/tree-sitter/tree-sitter/commit/e14e285a1087264a8c74a7c62fcaecc49db9d904 --- ci/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index 21175f63e0..24a4bd7450 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -26,7 +26,11 @@ npm install -g neovim npm link neovim echo "Install tree-sitter npm package" -npm install -g tree-sitter-cli + +# 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 npm link tree-sitter-cli echo "Install tree-sitter c parser" -- cgit From ec205f4b9b926a17b3211495ec6468db8b80aa6a Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo 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/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci/install.sh') 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" -- cgit From 3bee2f16048b89d9906a0e38d029b9b4b727b6a3 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 26 Oct 2019 20:26:56 -0400 Subject: ci: use python3 for flake8 'make pylint' fails if flake8 runs on python2. --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index 4a48a4f5d7..a6cd955da5 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -4,7 +4,7 @@ set -e set -o pipefail if [[ "${CI_TARGET}" == lint ]]; then - python -m pip -q install --user --upgrade flake8 + python3 -m pip -q install --user --upgrade flake8 exit fi -- cgit From 4bd51d8988b0af76a8c9e8cb38c537fc53346c20 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 30 Dec 2019 18:47:49 -0500 Subject: CI: set nodejs version to 10 on main scripts nvm can run within a bash shell only. --- ci/install.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index a6cd955da5..3364edfe70 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -22,6 +22,8 @@ echo "Install neovim RubyGem." gem install --no-document --version ">= 0.8.0" neovim echo "Install neovim npm package" +source ~/.nvm/nvm.sh +nvm use 10 npm install -g neovim npm link neovim -- cgit From 40cc5822b1dbd06615bcbe966fffb3a64d255462 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 11 Jan 2020 13:04:35 -0500 Subject: ci: install perl provider --- ci/install.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index 3364edfe70..b3ec9e7f65 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -50,3 +50,6 @@ else 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' -- cgit From 00c57c98dfb2df58875a3d9ad8fc557ec9a24cba Mon Sep 17 00:00:00 2001 From: Björn Linse Date: Sat, 25 Jan 2020 13:43:41 +0100 Subject: treesitter: add standard &rtp/parser/ search path for parsers --- ci/install.sh | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'ci/install.sh') 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' -- cgit From cca301d93974ddfb3eae749799f7675be3a2b6b5 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 18 Mar 2020 22:38:31 -0400 Subject: Install pynvim with --user to avoid permission issues [skip appveyor] --- ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/install.sh') diff --git a/ci/install.sh b/ci/install.sh index 769f00c5ba..a4dfc87a1b 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -14,9 +14,9 @@ fi # Use default CC to avoid compilation problems when installing Python modules. echo "Install neovim module for Python 3." -CC=cc python3 -m pip -q install --upgrade pynvim +CC=cc python3 -m pip -q install --user --upgrade pynvim echo "Install neovim module for Python 2." -CC=cc python2 -m pip -q install --upgrade pynvim +CC=cc python2 -m pip -q install --user --upgrade pynvim echo "Install neovim RubyGem." gem install --no-document --version ">= 0.8.0" neovim -- cgit