Make installable via LuaRocks (#35)

* switched ltreesitter to ltreesitter-ts (bundles in the tree-sitter lib) * updated LuaRocks version in CI * run unit tests in CI * updated rockspec to support the new version
teal-language · Dec 1, 2024 · f1f9117 · f1f9117
1 parent 85d6a63
commit f1f9117
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,10 +22,15 @@ jobs:
 
       - name: Install LuaRocks
         uses: leafo/gh-actions-luarocks@v4
+        with:
+          luarocksVersion: "3.10.0"
 
       - name: Build
         run: scripts/setup_local_luarocks.sh
 
+      - name: Run Tests
+        run: scripts/run_tests.sh
+
       - name: Lint
         run: scripts/lint_teal.sh
 

diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Navigate to the root of the repo
+cd "$(dirname "$0")/.."
+
+# Set the local LuaRocks path
+LUAROCKS_TREE="$(pwd)/luarocks_tree"
+
+# Run unit tests
+echo "Run LuaRocks tests:"
+luarocks test --tree="$LUAROCKS_TREE"
diff --git a/scripts/setup_local_luarocks.sh b/scripts/setup_local_luarocks.sh
@@ -4,11 +4,14 @@ set -e
 # Navigate to the root of the repo
 cd "$(dirname "$0")/.."
 
-luarocks init --tree=./luarocks_tree
-
 # Set the local LuaRocks path
 LUAROCKS_TREE="$(pwd)/luarocks_tree"
 
+# setup local LuaRocks
+luarocks init --tree="$LUAROCKS_TREE"
+PATH="$LUAROCKS_TREE/bin":"$PATH"
+export PATH
+
 # Install project dependencies from the rockspec
 echo "Installing project dependencies..."
 luarocks make --tree="$LUAROCKS_TREE"

diff --git a/teal-language-server-0.0.5-1.rockspec → teal-language-server-0.1.0-1.rockspec b/teal-language-server-0.0.5-1.rockspec → teal-language-server-0.1.0-1.rockspec
@@ -1,7 +1,7 @@
 rockspec_format = "3.0"
 
 package = "teal-language-server"
-version = "0.0.5-1"
+version = "0.1.0-1"
 
 source = {
    url = "git+https://github.com/teal-language/teal-language-server.git",
@@ -23,8 +23,8 @@ dependencies = {
    "inspect",
    "luv",
    "lusc_luv >= 4.0",
-   "ltreesitter",
-   "tree-sitter-cli",
+   "ltreesitter-ts==0.0.1",
+   "tree-sitter-cli==0.24.4",
    "tree-sitter-teal",
 }
 
@@ -47,6 +47,7 @@ build = {
       ["teal_language_server.env_updater"] = "gen/teal_language_server/env_updater.lua",
       ["teal_language_server.lsp"] = "gen/teal_language_server/lsp.lua",
       ["teal_language_server.lsp_events_manager"] = "gen/teal_language_server/lsp_events_manager.lua",
+      ["teal_language_server.lsp_formatter"] = "gen/teal_language_server/lsp_formatter.lua",
       ["teal_language_server.lsp_reader_writer"] = "gen/teal_language_server/lsp_reader_writer.lua",
       ["teal_language_server.main"] = "gen/teal_language_server/main.lua",
       ["teal_language_server.misc_handlers"] = "gen/teal_language_server/misc_handlers.lua",