Skip to content

Commit 7f8e1a1

Browse files
committed
Merge remote-tracking branch 'origin/master' into release/v26.2.0
# Conflicts: # .github/labeler.yml # .github/scripts/details-check-generate-matrix.sh # .github/workflows/action-details-check.yml # .github/workflows/labeler.yml # .github/workflows/update-copyright-years-in-license-file.yml # .prettierignore
2 parents a9eebeb + 7b5aa04 commit 7f8e1a1

20 files changed

Lines changed: 2401 additions & 302 deletions

.devcontainer/devcontainer.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"name": "BASH Dev Container",
3-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4-
"features": {
5-
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6-
"plugins": "prettier-plugin-sh"
7-
},
8-
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9-
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10-
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11-
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12-
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13-
"ghcr.io/devcontainers/features/github-cli:1": {}
14-
},
15-
"customizations": {
16-
"vscode": {
17-
"extensions": [
18-
"DavidAnson.vscode-markdownlint",
19-
"editorconfig.editorconfig",
20-
"esbenp.prettier-vscode",
21-
"github.vscode-github-actions",
22-
"GitHub.vscode-pull-request-github",
23-
"redhat.vscode-yaml",
24-
"timonwong.shellcheck",
25-
"yzhang.markdown-all-in-one"
26-
]
27-
}
28-
},
29-
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
2+
"name": "BASH Dev Container",
3+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4+
"features": {
5+
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6+
"plugins": "prettier-plugin-sh"
7+
},
8+
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9+
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10+
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11+
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12+
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13+
"ghcr.io/devcontainers/features/github-cli:1": {}
14+
},
15+
"customizations": {
16+
"vscode": {
17+
"extensions": [
18+
"DavidAnson.vscode-markdownlint",
19+
"editorconfig.editorconfig",
20+
"esbenp.prettier-vscode",
21+
"github.vscode-github-actions",
22+
"GitHub.vscode-pull-request-github",
23+
"redhat.vscode-yaml",
24+
"timonwong.shellcheck",
25+
"yzhang.markdown-all-in-one"
26+
]
27+
}
28+
},
29+
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template && sudo apt-get update && sudo apt-get install -y ripgrep"
3030
}

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ trim_trailing_whitespace = true
1616
indent_size = 4
1717
indent_style = tab
1818

19-
# JSON Files (Biome formatting)
19+
# JSON Files
2020
[*.json]
21-
indent_style = tab
21+
indent_style = space
2222
indent_size = 2
2323

2424
# Steam appmanifest files (Valve ACF format)

.github/labeler.yml

Lines changed: 30 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
"command: backup":
2-
- "/(backup)/i"
2+
- "/(command:\\s*backup)/i"
33
"command: console":
4-
- "/(console|tmux)/i"
4+
- "/(command:\\s*console)/i"
55
"command: debug":
66
- "/(command: debug)/i"
77
"command: details":
88
- "/(command: details)/i"
99
"command: fast-dl":
10-
- "/(fast-dl|fastdl)/i"
10+
- "/(command:\\s*fast-?dl)/i"
1111
"command: install":
12-
- "/(install)/i"
12+
- "/(command:\\s*install)/i"
1313
"command: mods":
14-
- "/(command: mods)/i"
14+
- "/(command:\\s*mods(?:-install|-update|-remove)?)/i"
1515
"command: monitor":
1616
- "/(command: monitor)/i"
1717
"command: post-details":
@@ -27,147 +27,59 @@
2727
"command: stop":
2828
- "/(command: stop)/i"
2929
"command: update-lgsm":
30-
- "/(update-lgsm)/i"
30+
- "/(command:\\s*update-lgsm)/i"
3131
"command: update":
32-
- "/(command: update)/i"
32+
- "/(command:\\s*update(?!-lgsm)\\b)/i"
3333
"command: validate":
34-
- "/(validate)/i"
34+
- "/(command:\\s*validate)/i"
3535
"command: wipe":
36-
- "/(wipe)/i"
36+
- "/(command:\\s*wipe)/i"
3737

3838
# Distros
3939
"distro: AlmaLinux":
40-
- "/(Alma)/i"
40+
- "/\\bAlmaLinux(?:\\s+\\d+)?\\b/i"
4141
"distro: Arch Linux":
42-
- "/(Arch Linux)/i"
42+
- "/\\bArch Linux\\b/i"
4343
"distro: CentOS":
44-
- "/(CentOS)/i"
44+
- "/\\bCentOS(?:\\s+\\d+)?\\b/i"
4545
"distro: Debian":
46-
- "/(Debian)/i"
46+
- "/\\bDebian(?:\\s+\\d+)?\\b/i"
4747
"distro: Fedora":
48-
- "/(Fedora)/i"
48+
- "/\\bFedora(?:\\s+\\d+)?\\b/i"
4949
"distro: openSUSE":
50-
- "/(openSUSE|suse)/i"
50+
- "/\\bopenSUSE\\b/i"
5151
"distro: Rocky Linux":
52-
- "/(Rocky)/i"
52+
- "/\\bRocky(?:\\s+Linux)?(?:\\s+\\d+)?\\b/i"
5353
"distro: Slackware":
54-
- "/(Slackware)/i"
54+
- "/\\bSlackware(?:\\s+\\d+)?\\b/i"
5555
"distro: Ubuntu":
56-
- "/(Ubuntu)/i"
57-
58-
# Games
59-
"game: 7 Days to Die":
60-
- "/(7 Days to Die|sdtd)/i"
61-
"game: Ark: Survival Evolved":
62-
- "/(Ark: Survival Evolved|Ark)/i"
63-
"game: ARMA 3":
64-
- "/(ARMA 3|ARMA3)/i"
65-
"game: Assetto Corsa":
66-
- "/(Assetto Corsa)/i"
67-
"game: Avorion":
68-
- "/(Avorion)/i"
69-
"game: Ballistic Overkill":
70-
- "/(Ballistic Overkill)/i"
71-
"game: BATTALION: Legacy":
72-
- "/(BATTALION: Legacy|Battalion 1944)/i"
73-
"game: Barotrauma":
74-
- "/(Barotrauma)/i"
75-
"game: Counter-Strike: Global Offensive":
76-
- "/(Counter-Strike: Global Offensive|CS:GO|csgo)/i"
77-
"game: Counter-Strike 2":
78-
- "/(Counter-Strike 2|CS2)/i"
79-
"game: Counter-Strike: Source":
80-
- "/(Counter-Strike: Source|Counter Strike: Source|CS:S)/i"
81-
"game: Counter-Strike 1.6":
82-
- "/(Counter-Strike 1.6|Counter Strike 1.6|CS 1.6|cs1.6)/i"
83-
"game: DayZ":
84-
- "/(DayZ|Dayz)/i"
85-
"game: Deathmatch Classic":
86-
- "/(Deathmatch Classic|Death Match Classic|DMC)/i"
87-
"game: Don't Starve Together":
88-
- "/(Don't Starve Together|Dont Starve Together|DST)/i"
89-
"game: Eco":
90-
- "/(^Eco$)/i"
91-
"game: Factorio":
92-
- "/(Factorio)/i"
93-
"game: Garrys Mod":
94-
- "/(Garry's Mod|Garrys Mod|GMod)/i"
95-
"game: Hurtworld":
96-
- "/(Hurtworld|Hurtword)/i"
97-
"game: Insurgency":
98-
- "/(^Insurgency$|Insurgecy)/i"
99-
"game: Insurgency: Sandstorm":
100-
- "/(Insurgency: Sandstorm)/i"
101-
"game: Killing Floor 2":
102-
- "/(Killing Floor 2|KF2)/i"
103-
"game: Left 4 Dead 2":
104-
- "/(Left 4 Dead 2|L4D2)/i"
105-
"game: Minecraft":
106-
- "/(Minecraft)((?!bedrock).)*$/i"
107-
"game: Minecraft Bedrock":
108-
- "/(Bedrock)/i"
109-
"game: Project Zomboid":
110-
- "/(Project Zomboid|PZ)/i"
111-
"game: Quake 3: Arena":
112-
- "/(Quake 3: Arena|Quake 3|Q3A|q3)/i"
113-
"game: Quake World":
114-
- "/(Quake World|QuakeWorld)/i"
115-
"game: Rising World":
116-
- "/(Rising World)/i"
117-
"game: Satisfactory":
118-
- "/(Satisfactory)/i"
119-
"game: Squad":
120-
- "/(Squad)/i"
121-
"game: Squad 44":
122-
- "/(Squad 44|Post Scriptum)/i"
123-
"game: Starbound":
124-
- "/(Starbound)/i"
125-
"game: Stationeers":
126-
- "/(Stationeers)/i"
127-
"game: Teamspeak 3":
128-
- "/(Teamspeak 3|ts3)/i"
129-
"game: Rust":
130-
- "/(Rust)/i"
131-
"game: Soldier Of Fortune 2: Gold Edition":
132-
- "/(Soldier Of Fortune 2: Gold Edition|Soldier of Fortune 2)/i"
133-
"game: Unturned":
134-
- "/(Unturned)/i"
135-
"game: Unreal Tournament 99":
136-
- "/(Unreal Tournament 99|ut99)/i"
137-
"game: Unreal Tournament 2004":
138-
- "/(Unreal Tournament 2004|ut2k4)/i"
139-
"game: Unreal Tournament 3":
140-
- "/(Unreal Tournament 3|ut3)/i"
141-
"game: Valheim":
142-
- "/(Valheim)/i"
143-
"game: Zombie Master: Reborn":
144-
- "/(Zombie Master: Reborn|Zombie Master Reborn)/i"
56+
- "/\\bUbuntu(?:\\s+\\d+(?:\\.\\d+)?)?\\b/i"
14557

14658
# Info
14759
"info: alerts":
148-
- "/(alert)/i"
60+
- "/(alert_(discord|email|gotify|ifttt|ntfy|pushbullet|pushover|rocketchat|slack|telegram)|command:\\s*test-alert)/i"
14961
"info: dependency":
150-
- "/(dependency|deps)/i"
62+
- "/\\b(dependency|dependencies|deps)\\b/i"
15163
"info: docker":
152-
- "/(docker)/i"
64+
- "/\\bdocker\\b/i"
15365
"info: docs":
154-
- "/(documentation|^docs$)/i"
66+
- "/(^docs$)/i"
15567
"info: email":
156-
- "/(postfix|sendmail|exim|smtp)/i"
68+
- "/\\b(postfix|sendmail|exim|smtp)\\b/i"
15769
"info: query":
158-
- "/(gamedig|gsquery)/i"
70+
- "/\\b(gamedig|gsquery)\\b/i"
15971
"info: steamcmd":
160-
- "/(steamcmd)/i"
72+
- "/\\bsteamcmd\\b/i"
16173
"info: systemd":
162-
- "/(systemd)/i"
74+
- "/\\bsystemd\\b/i"
16375
"info: tmux":
164-
- "/(tmux)/i"
76+
- "/(tmuxception|check_tmuxception)/i"
16577
"info: website":
166-
- "/(website)/i"
78+
- "/\\bwebsite\\b/i"
16779

16880
# Type
16981
"type: game server request":
170-
- "/(Server Request)/i"
82+
- "/(^\\[server request\\]|^server request:|type:\\s*game server request)/im"
17183
"type: bug":
17284
- "/(\\[bug\\]|bug report|type: bug)/i"
17385
"type: bugfix":
@@ -219,4 +131,4 @@
219131
"scope: all servers":
220132
- "/(scope: all servers)/i"
221133
"scope: documentation":
222-
- "/(scope: documentation)/i"
134+
- "/(scope: documentation|scope: documentation only)/i"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)