Skip to content

Commit 85b93bf

Browse files
authored
Merge pull request #8 from /issues/7-remove_git_submodule_dependencies
feat(dependencies): removed git submodule requirements
2 parents 6655865 + d395561 commit 85b93bf

File tree

7 files changed

+497
-15
lines changed

7 files changed

+497
-15
lines changed

.github/workflows/.luarc.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
"diagnostics.libraryFiles": "Disable",
33
"runtime.version": "LuaJIT",
44
"workspace.checkThirdParty": "Disable",
5-
"workspace.ignoreDir": [".lua", ".luarocks"],
5+
"workspace.ignoreDir": [".dependencies", ".lua", ".luarocks"],
66
"workspace.library": [
77
"$PWD/.dependencies/busted/library",
88
"$PWD/.dependencies/luassert/library",
99
"$PWD/.dependencies/luvit-meta/library",
10-
"$VIMRUNTIME/lua",
11-
"lua"
10+
"$VIMRUNTIME/lua"
1211
]
1312
}

.github/workflows/llscheck.yml

+20-6
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@master
19-
with:
20-
submodules: true # Ensure submodules are checked out
21-
22-
- name: Update Submodules
23-
run: git submodule update --init --recursive
2419

2520
- uses: rhysd/action-setup-vim@v1
2621
# NOTE: We need Neovim installed in order to expose the $VIMRUNTIME
@@ -49,7 +44,26 @@ jobs:
4944
- name: Install llscheck
5045
run: |
5146
luarocks install llscheck
47+
luarocks install nlua
48+
49+
- name: Clone dependencies - busted
50+
uses: actions/checkout@v4
51+
with:
52+
repository: "LuaCATS/busted"
53+
path: ".dependencies/busted"
54+
55+
- name: Clone dependencies - luassert
56+
uses: actions/checkout@v4
57+
with:
58+
repository: "LuaCATS/luassert"
59+
path: ".dependencies/luassert"
60+
61+
- name: Clone dependencies - luavit-meta
62+
uses: actions/checkout@v4
63+
with:
64+
repository: "Bilal2453/luvit-meta"
65+
path: ".dependencies/luvit-meta"
5266

5367
- name: test
5468
run: |
55-
VIMRUNTIME=`nvim -l scripts/print_vimruntime_environment_variable.lua` llscheck --configpath .github/workflows/.luarc.json .
69+
VIMRUNTIME=`nlua -e 'io.write(os.getenv("VIMRUNTIME"))'` llscheck --configpath .github/workflows/.luarc.json .

.luarc.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"diagnostics.libraryFiles": "Disable",
33
"runtime.version": "LuaJIT",
44
"workspace.checkThirdParty": "Disable",
5+
"workspace.ignoreDir": [
6+
".dependencies"
7+
],
58
"workspace.library": [
69
"$PWD/.dependencies/busted/library",
710
"$PWD/.dependencies/luassert/library",
811
"$PWD/.dependencies/luvit-meta/library",
9-
"$VIMRUNTIME/lua",
10-
"lua"
12+
"$VIMRUNTIME/lua"
1113
]
1214
}

Makefile

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
11
.PHONY: api_documentation llscheck luacheck stylua test
22

3-
llscheck:
4-
VIMRUNTIME=`nvim -l scripts/print_vimruntime_environment_variable.lua` llscheck --configpath .luarc.json .
3+
# Git will error if the repository already exists. We ignore the error.
4+
# NOTE: We still print out that we did the clone to the user so that they know.
5+
#
6+
ifeq ($(OS),Windows_NT)
7+
IGNORE_EXISTING = 2> nul
8+
else
9+
IGNORE_EXISTING = 2> /dev/null || true
10+
endif
11+
12+
clone_git_dependencies:
13+
git clone git@github.com:LuaCATS/busted.git .dependencies/busted $(IGNORE_EXISTING)
14+
git clone git@github.com:LuaCATS/luassert.git .dependencies/luassert $(IGNORE_EXISTING)
15+
git clone git@github.com:Bilal2453/luvit-meta.git .dependencies/luvit-meta $(IGNORE_EXISTING)
16+
17+
api_documentation:
18+
nvim -u scripts/make_api_documentation/minimal_init.lua -l scripts/make_api_documentation/main.lua
19+
20+
llscheck: clone_git_dependencies
21+
VIMRUNTIME=`nlua -e 'io.write(os.getenv("VIMRUNTIME"))'` llscheck --configpath .luarc.json .
522

623
luacheck:
724
luacheck lua plugin scripts spec
825

926
stylua:
1027
stylua lua plugin scripts spec
1128

12-
test:
29+
test: clone_git_dependencies
1330
busted --helper spec/minimal_init.lua .

0 commit comments

Comments
 (0)