Skip to content

Commit c74edc4

Browse files
Merge branch 'main' of github.com:Josef-Friedrich/LLS-Addons into update-luasocket
2 parents a3347ce + bd4646e commit c74edc4

File tree

18 files changed

+50
-60
lines changed

18 files changed

+50
-60
lines changed

.github/PULL_REQUEST_TEMPLATE/newAddon.md

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ Self-review Checklist:
1212
1313
- Verify that the config.json is valid by pasting it into https://www.jsonschemavalidator.net/s/JxX3xtlV.
1414
15-
- StyLua (https://github.com/JohnnyMorganz/StyLua) has been run to meet code style requirements.
16-
1715
- Resolved issues are linked (https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
1816
1917
-->

.github/workflows/pull_request.yml

-48
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,6 @@ on:
44
pull_request_target:
55

66
jobs:
7-
style:
8-
name: Run StyLua
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@v3
12-
name: Checkout LLS-Addons
13-
with:
14-
submodules: false
15-
16-
- name: Set Base and Head Refs
17-
run: |
18-
echo "BASE_REF=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
19-
echo "HEAD_REF=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
20-
echo "BASE_REMOTE=${{github.event.pull_request.base.repo.clone_url}}" >> $GITHUB_ENV
21-
echo "HEAD_REMOTE=${{github.event.pull_request.head.repo.clone_url}}" >> $GITHUB_ENV
22-
23-
- name: Fetch Branches
24-
run: |
25-
git remote add base $BASE_REMOTE
26-
git fetch base $BASE_REF
27-
28-
git remote add head $HEAD_REMOTE
29-
git fetch head $HEAD_REF
30-
31-
- name: Detect Added Submodules
32-
run: |
33-
ADDED_SUBMODULES=$(git diff --submodule --compact-summary remotes/base/${BASE_REF}..remotes/head/${HEAD_REF} | grep -vE ".*\(gone\)" | grep -oE "addons/.*/module")
34-
echo "Added submodules: $ADDED_SUBMODULES"
35-
{
36-
echo "ADDED_SUBMODULES<<EOF"
37-
echo "$ADDED_SUBMODULES"
38-
echo "EOF"
39-
} >> $GITHUB_ENV
40-
41-
- name: Fetch submodules
42-
run: |
43-
for submodule in $ADDED_SUBMODULES; do
44-
echo "Getting submodule: $submodule"
45-
git submodule update --init --recursive $submodule
46-
done
47-
48-
- uses: JohnnyMorganz/[email protected]
49-
name: Run StyLua
50-
with:
51-
token: ${{ secrets.GITHUB_TOKEN }}
52-
version: latest
53-
args: --check addons
54-
557
metadata:
568
name: Fetch metadata
579
runs-on: ubuntu-latest

.gitmodules

+12
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,15 @@
212212
[submodule "addons/HLA-VScript/module"]
213213
path = addons/HLA-VScript/module
214214
url = https://github.com/FrostSource/HLA-VScript.git
215+
[submodule "addons/pico8/module"]
216+
path = addons/pico8/module
217+
url = https://github.com/ahai64/pico8
218+
[submodule "addons/picotron/module"]
219+
path = addons/picotron/module
220+
url = https://github.com/ahai64/picotron
221+
[submodule "addons/lua-enet/module"]
222+
path = addons/lua-enet/module
223+
url = https://github.com/masakk1/LuaCATS-lua-enet.git
224+
[submodule "addons/lsqlite3/module"]
225+
path = addons/lsqlite3/module
226+
url = https://github.com/KaitlynEthylia/LuaSQLite3-annotations

CONTRIBUTING.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ There are a few steps to adding your own addon. The process is still being worke
4242
2. Create a branch where you can make your changes. Try to name the branch something related to what you are doing, e.g. `issue-58`, `add-busted`, `update-luassert`, etc.
4343
3. Create an `info.json` file that lives in your addon's directory (e.g. `addons/myAddon/info.json`. You can copy an `info.json` from [an already included addon](https://github.com/LuaLS/LLS-Addons/blob/main/addons/cc-tweaked/info.json) as a template.
4444
4. In your `info.json`, specify a `name` (display name) and `description`. The `size` and `hasPlugin` values will be generated automatically.
45-
5. Run [StyLua](https://github.com/JohnnyMorganz/StyLua) on your addon to apply the proper code style to the definition files.
46-
> [!NOTE]
47-
> If you have a `.editorconfig` file, make sure to run StyLua with the `--no-editorconfig` flag to run StyLua using its default configuration.
4845

49-
7. Commit your addon as a submodule to your fork.
46+
5. Commit your addon as a submodule to your fork.
5047
- Your git command should look like `git submodule add $HTTP_CLONE_URL addons/myAddon/module`.
5148
- If you have many miscellaneous/config files in your addon repository, please create a new branch (e.g. `publish`) where you can include the minimum number of files (`LICENSE` is fine). You can then use `git submodule add -b $BRANCH_NAME $HTTP_CLONE_URL addons/myAddon/module` to add your addon.
5249

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
![Addons count](https://img.shields.io/github/directory-file-count/LuaLS/LLS-Addons/addons?label=Addons&type=dir&color=097aba)
55
![Contributors](https://img.shields.io/github/contributors/LuaLS/LLS-Addons?label=Contributors)
6-
![Enforces StyLua](https://img.shields.io/badge/Enforces-StyLua-b2749f)
76

87
Welcome to the repository of [addons][addon-wiki] for the [Lua Language Server][lls-github] by [sumneko](https://github.com/sumneko)!
98

addons/lsqlite3/info.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
3+
"name": "lsqlite3",
4+
"description": "Annotations for the LuaSQLite3 Library",
5+
"size": 51283,
6+
"hasPlugin": false
7+
}

addons/lsqlite3/module

Submodule module added at 0df638d

addons/lua-enet/info.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
3+
"name": "Lua-ENet",
4+
"description": "Definitions for the Lua-ENet library",
5+
"size": 12472,
6+
"hasPlugin": false
7+
}

addons/lua-enet/module

Submodule module added at 4a99b86

addons/ncine/info.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
33
"name": "nCine",
44
"description": "Definitions for the nCine, a cross-platform 2D game framework with an emphasis on performance",
5-
"size": 183598,
5+
"size": 185638,
66
"hasPlugin": false
77
}

addons/pico8/info.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
3+
"name": "PICO-8",
4+
"description": "Definitions for the PICO-8 fantasy console",
5+
"size": 30814,
6+
"hasPlugin": false
7+
}

addons/pico8/module

Submodule module added at 408bdd4

addons/picotron/info.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
3+
"name": "Picotron",
4+
"description": "Definitions for the Picotron fantasy workstation",
5+
"size": 57911,
6+
"hasPlugin": false
7+
}

addons/picotron/module

Submodule module added at c2218ad

addons/umbrella-unstable/info.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"$schema": "https://raw.githubusercontent.com/LuaLS/LLS-Addons/main/schemas/addon_info.schema.json",
33
"name": "Umbrella (Unstable)",
44
"description": "Definitions for the Unstable version of Project Zomboid's API",
5-
"size": 7739587,
5+
"size": 7804845,
66
"hasPlugin": false
77
}

addons/umbrella-unstable/module

Submodule module updated 180 files

0 commit comments

Comments
 (0)