ci: remove update-lockfile shell script

.github/workflows/test-queries.yml

@@ -1,12 +1,12 @@
 name: Test queries
 
 on:
-  push:
-    branches:
-      - "master"
+  # push:
+  #   branches:
+  #     - "main"
   pull_request:
     branches:
-      - "master"
+      - "main"
 
 # Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
@@ -24,29 +24,29 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
         cc: [gcc, clang]
-        nvim_tag: [v0.10.4]
+        nvim_tag: [nightly]
         exclude:
           - os: ubuntu-latest
             cc: clang
-            nvim_tag: v0.10.4
+            nvim_tag: nightly
 
           - os: macos-14
             cc: gcc
-            nvim_tag: v0.10.4
-
-          - os: windows-latest
-            cc: clang
-            nvim_tag: v0.10.4
-
-        include:
-          - os: windows-latest
-            cc: cl
             nvim_tag: nightly
 
-          - os: ubuntu-latest
+          - os: windows-latest
             cc: gcc
             nvim_tag: nightly
 
+        # include:
+          # - os: windows-latest
+          #   cc: cl
+          #   nvim_tag: nightly
+
+          # - os: ubuntu-latest
+          #   cc: gcc
+          #   nvim_tag: nightly
+
     name: Parser compilation
     runs-on: ${{ matrix.os }}
     env:
@@ -69,8 +69,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./parser/
-            ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/
+            ~/.local/share/nvim/site/parser/
+            ~/AppData/Local/nvim-data/site/parser/
           key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
             './lockfile.json',
             './lua/nvim-treesitter/install.lua',
@@ -78,11 +78,7 @@ jobs:
             './lua/nvim-treesitter/shell_command_selectors.lua') }}
 
       - name: Compile parsers
-        run: $NVIM --headless -c "lua require'nvim-treesitter.install'.prefer_git=false" -c "TSInstallSync all" -c "q"
-
-      - name: Post compile Windows
-        if: runner.os == 'Windows'
-        run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
+        run: $NVIM -l ./scripts/install-parsers.lua
 
       - name: Check query files
         run: $NVIM -l ./scripts/check-queries.lua

.github/workflows/tests.yml

@@ -1,12 +1,12 @@
 name: Tests
 
 on:
-  push:
-    branches:
-      - "master"
+  # push:
+  #   branches:
+  #     - "main"
   pull_request:
     branches:
-      - "master"
+      - "main"
 
 # Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
@@ -39,7 +39,8 @@ jobs:
 
       - name: Install and prepare Neovim
         env:
-          NVIM_TAG: v0.10.4
+          NVIM_TAG: nightly
+          TREE_SITTER_CLI_TAG: v0.20.8
         run: |
           bash ./scripts/ci-install.sh
 
@@ -57,8 +58,8 @@ jobs:
             './lua/nvim-treesitter/shell_selectors.lua') }}
 
       - name: Compile parsers Unix like
-        run: |
-          nvim --headless -c "TSInstallSync all" -c "q"
+        if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}
+        run: nvim -l ./scripts/install-parsers.lua
 
       - name: Tests
         run: PATH=/usr/local/bin:$PATH ./scripts/run_tests.sh

.github/workflows/update-lockfile.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: main
 
       - uses: actions/create-github-app-token@v2
         id: app-token
@@ -34,10 +34,7 @@ jobs:
           SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,dhall,elm,enforce,git_config,nickel,rescript,rust,slint,sql,t32,templ,typespec,verilog,wit"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
-          nvim -l scripts/write-lockfile.lua
-          # Pretty print
-          cp lockfile.json /tmp/lockfile.json
-          cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
+          nvim -l ./scripts/update-lockfile.lua
           UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")')
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 

.github/workflows/update-readme.yml

@@ -3,7 +3,7 @@ name: Update README
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 jobs: