ci: use nvim v0.5.1 on CI

6 files changed, 22 insertions, 16 deletions

diff --git a/.github/workflows/check-query-files-and-compilation.yml b/.github/workflows/check-query-files-and-compilation.yml
index c982e21b8..d89b09fa5 100644
--- a/.github/workflows/check-query-files-and-compilation.yml
+++ b/.github/workflows/check-query-files-and-compilation.yml
@@ -30,6 +30,9 @@ jobs:
       - uses: actions/setup-node@v2
 
       - name: Install and prepare Neovim
+        env:
+          NVIM_TAG: v0.5.1
+          TREE_SITTER_CLI_TAG: v0.20.0
         run: |
           bash ./scripts/ci-install-${{ matrix.os }}.sh
 
@@ -38,16 +41,10 @@ jobs:
         run: |
           nvim --headless -c "TSInstallSync all" -c "q"
 
-      - name: Check query files (Unix)
-        if: matrix.os != 'windows-latest'
-        env:
-          ALLOWED_INSTALLATION_FAILURES: haskell
-        run: nvim --headless -c "luafile ./scripts/check-queries.lua" -c "q"
-
       - name: Compile parsers Windows
         if: matrix.os == 'windows-latest'
         run: |
-          C:\\tools\\neovim\\Neovim\\bin\\nvim.exe --headless -c "TSInstallSync all" -c "q"
+          Neovim\\bin\\nvim.exe --headless -c "TSInstallSync all" -c "q"
 
       - name: Post compile Windows
         if: matrix.os == 'windows-latest'
@@ -59,9 +56,14 @@ jobs:
           name: parsers-${{ matrix.os }}-${{ matrix.cc }}-x86_64
           path: parser/*
 
+      - name: Check query files (Unix)
+        if: matrix.os != 'windows-latest'
+        env:
+          ALLOWED_INSTALLATION_FAILURES: haskell
+        run: nvim --headless -c "luafile ./scripts/check-queries.lua" -c "q"
+
       - name: Check query files (Windows)
         if: matrix.os == 'windows-latest'
         env:
           ALLOWED_INSTALLATION_FAILURES: haskell
-        run: C:\\tools\\neovim\\Neovim\\bin\\nvim.exe --headless -c "luafile ./scripts/check-queries.lua" -c "q"
-
+        run: Neovim\\bin\\nvim.exe --headless -c "luafile ./scripts/check-queries.lua" -c "q"
diff --git a/.github/workflows/update-parsers-pr.yml b/.github/workflows/update-parsers-pr.yml
index 836e0b284..238bbd945 100644
--- a/.github/workflows/update-parsers-pr.yml
+++ b/.github/workflows/update-parsers-pr.yml
@@ -15,13 +15,15 @@ jobs:
           ref: master
 
       - name: Prepare
+        env:
+          NVIM_TAG: v0.5.1
         run: |
           sudo apt-get update
           sudo add-apt-repository universe
           wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
           mv ./jq-linux64 /tmp/jq
           chmod +x /tmp/jq
-          wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
+          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
           chmod u+x nvim.appimage
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
           ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index d46578036..8d10198e7 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -11,10 +11,12 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Prepare
+        env:
+          NVIM_TAG: v0.5.1
         run: |
           sudo apt-get update
           sudo add-apt-repository universe
-          wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
+          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
           chmod u+x nvim.appimage
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
           ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-macos-latest.sh b/scripts/ci-install-macos-latest.sh
index fe57186af..1357e1239 100644
--- a/scripts/ci-install-macos-latest.sh
+++ b/scripts/ci-install-macos-latest.sh
@@ -1,4 +1,4 @@
-curl -L https://github.com/neovim/neovim/releases/download/nightly/nvim-macos.tar.gz | tar -xz
+curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
 sudo ln -s $(pwd)/nvim-osx64/bin/nvim /usr/local/bin
 mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
 ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-ubuntu-latest.sh b/scripts/ci-install-ubuntu-latest.sh
index 8f20592c3..45a65d419 100644
--- a/scripts/ci-install-ubuntu-latest.sh
+++ b/scripts/ci-install-ubuntu-latest.sh
@@ -1,9 +1,9 @@
 sudo apt-get update
 sudo add-apt-repository universe
-wget -O - https://github.com/tree-sitter/tree-sitter/releases/download/v0.19.4/tree-sitter-linux-x64.gz | gunzip -c > tree-sitter
+wget -O - https://github.com/tree-sitter/tree-sitter/releases/download/${TREE_SITTER_CLI_TAG}/tree-sitter-linux-x64.gz | gunzip -c > tree-sitter
 sudo cp ./tree-sitter /usr/bin/tree-sitter
 sudo chmod uog+rwx /usr/bin/tree-sitter
-wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
+wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
 chmod u+x nvim.appimage
 mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
 ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-windows-latest.sh b/scripts/ci-install-windows-latest.sh
index f69284e55..6af5b0ce9 100644
--- a/scripts/ci-install-windows-latest.sh
+++ b/scripts/ci-install-windows-latest.sh
@@ -1,5 +1,5 @@
-choco install neovim --pre
+curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
+unzip nvim-win64
 mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
 mkdir -p ~/AppData/Local/nvim-data
 cp -r $(pwd) ~/AppData/Local/nvim/pack/nvim-treesitter/start
-