Skip to content

Commit 756adfb

Browse files
authored
Merge branch 'sumneko:master' into master
2 parents 798e8af + c45d862 commit 756adfb

File tree

161 files changed

+9634
-8941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+9634
-8941
lines changed

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ if_condition_no_continuation_indent = false
4343

4444

4545
# optional crlf/lf
46-
end_of_line = crlf
46+
end_of_line = auto
47+
detect_end_of_line = true
4748

4849
# [line layout]
4950
# The following configuration supports three expressions

.github/workflows/build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,19 @@ jobs:
2121
matrix:
2222
include:
2323
- { os: ubuntu-18.04, target: linux, platform: linux-x64 }
24+
- { os: ubuntu-18.04, target: linux, platform: linux-arm64 }
2425
- { os: macos-11, target: darwin, platform: darwin-x64 }
2526
- { os: macos-11, target: darwin, platform: darwin-arm64 }
2627
- { os: windows-latest, target: windows, platform: win32-ia32 }
2728
- { os: windows-latest, target: windows, platform: win32-x64 }
2829
runs-on: ${{ matrix.os }}
2930
steps:
31+
- name: Install aarch64-linux-gnu
32+
if: ${{ matrix.platform == 'linux-arm64' }}
33+
run: |
34+
sudo apt-get update
35+
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
36+
3037
- uses: actions/checkout@v2
3138
with:
3239
submodules: recursive

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
[submodule "3rd/lpeglabel"]
88
path = 3rd/lpeglabel
99
url = https://github.com/sqmedeiros/lpeglabel
10-
[submodule "3rd/rcedit"]
11-
path = 3rd/rcedit
12-
url = https://github.com/electron/rcedit
1310
[submodule "3rd/love-api"]
1411
path = 3rd/love-api
1512
url = https://github.com/love2d-community/love-api

.luarc.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
3-
"color": {
4-
"mode": "SemanticEnhanced"
5-
},
62
"diagnostics": {
73
"disable": [
84
"close-non-object"

.vscode/launch.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
"luaVersion": "5.4",
1616
"consoleCoding": "utf8",
1717
"sourceCoding": "utf8",
18+
"console": "internalConsole",
1819
"outputCapture": [
1920
"print",
2021
"stderr",
2122
],
2223
},
2324
{
24-
"name": "🪡attach",
25+
"name": "🍄attach",
2526
"type": "lua",
2627
"request": "attach",
2728
"stopOnEntry": false,

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"--preview",
55
"--develop=true",
66
"--dbgport=11413",
7+
"--loglevel=trace",
78
]
89
}

3rd/EmmyLuaCodeStyle

Submodule EmmyLuaCodeStyle updated 51 files

3rd/bee.lua

Submodule bee.lua updated 54 files

0 commit comments

Comments
 (0)