fey.naomi/fennel-ls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dependency checks in CI.

Browse Source
This commit is contained in:
Phil Hagelberg 2025-02-23 22:53:13 -08:00
parent 2edb9c4df5
commit 487f4ca6f2
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -15,7 +15,7 @@ REQUIRE_AS_INCLUDE_SETTINGS=$(shell $(FENNEL) tools/require-flags.fnl)
ROCKSPEC_LATEST_SCM=rockspecs/fennel-ls-scm-$(shell ls rockspecs | grep -Eo 'scm-[0-9]+' | grep -Eo [0-9]+ | sort -n | tail -1).rockspec ROCKSPEC_LATEST_SCM=rockspecs/fennel-ls-scm-$(shell ls rockspecs | grep -Eo 'scm-[0-9]+' | grep -Eo [0-9]+ | sort -n | tail -1).rockspec
.PHONY: all clean test repl install docs install-deps ci selflint \ .PHONY: all clean test repl install docs install-deps ci selflint deps \
rm-docs rm-deps count rm-docs rm-deps count
all: $(EXE) all: $(EXE)
@ -65,13 +65,13 @@ ci:
$(MAKE) test LUA=luajit $(MAKE) test LUA=luajit
# Make sure the dependency files are correct # Make sure the dependency files are correct
rm -rf old-deps old-fennel
mv deps old-deps mv deps old-deps
mv fennel old-fennel mv fennel old-fennel
$(MAKE) FENNEL=./old-fennel deps $(MAKE) FENNEL=./old-fennel deps
diff -r deps old-deps diff -r deps old-deps
diff -r fennel old-fennel diff -r fennel old-fennel
rm -rf old-deps rm -rf old-deps old-fennel
rm -f old-fennel
# test that luarocks builds and runs # test that luarocks builds and runs
luarocks install $(ROCKSPEC_LATEST_SCM) --dev --local luarocks install $(ROCKSPEC_LATEST_SCM) --dev --local
@ -79,4 +79,4 @@ ci:
fennel-ls --lint fennel-ls --lint
clean: clean:
rm -f $(EXE) rm -fr $(EXE) old-deps old-fennel build/

10
README.md
View File

@ -11,12 +11,12 @@ Provides intelligent editing features for fennel files.
## License ## License
fennel-ls is licensed under the MIT license. See LICENSE for more info. fennel-ls is licensed under the MIT license. See LICENSE for more info.
This project also contains files from other projects: This repository also contains files from other projects:
* `fennel` and `deps/fennel.lua` are compiled from [fennel](https://git.sr.ht/~technomancy/fennel) [MIT license]
* `deps/faith.lua` is from [faith](https://git.sr.ht/~technomancy/faith) [MIT license]
* `deps/pl/stringio.lua` is from [Penlight](https://github.com/lunarmodules/Penlight) [MIT license]
* `deps/dkjson.lua` is from [dkjson](http://dkolf.de/dkjson-lua/) [MIT license]
* `fennel` and `deps/fennel.lua` are compiled from [fennel](https://git.sr.ht/~technomancy/fennel) [MIT license]
* `deps/dkjson.lua` is from [dkjson](http://dkolf.de/dkjson-lua/) [MIT license]
* `deps/faith.lua` is from [faith](https://git.sr.ht/~technomancy/faith) [MIT license] (test only)
* `deps/pl/stringio.lua` is from [Penlight](https://github.com/lunarmodules/Penlight) [MIT license] (test only)
* `src/fennel-ls/docs/generated/*` contains files generated from other sources. It contains information from: * `src/fennel-ls/docs/generated/*` contains files generated from other sources. It contains information from:
* the [lua](https://lua.org) reference [MIT license] * the [lua](https://lua.org) reference [MIT license]
* [TIC80's "learn" webpage](https://tic80.com/learn) [MIT license] * [TIC80's "learn" webpage](https://tic80.com/learn) [MIT license]

3
tools/get-deps.fnl
View File

@ -5,7 +5,8 @@
(sh :git :clone :-c :advice.detachedHead=false :--depth=1 :--branch tag url location) (sh :git :clone :-c :advice.detachedHead=false :--depth=1 :--branch tag url location)
(sh :git :clone :-c :advice.detachedHead=false :--depth=1 url location))) (sh :git :clone :-c :advice.detachedHead=false :--depth=1 url location)))
(local fennel-version "1.5.1") ;; TODO: currently you have to run make clean after changing any of these
(local fennel-version "1.5.3")
(local faith-version "0.2.0") (local faith-version "0.2.0")
(local penlight-version "1.14.0") (local penlight-version "1.14.0")
(local dkjson-version "2.7") (local dkjson-version "2.7")