Skip to content

Commit 24183e7

Browse files
committed
Merge branch 'develop' into 4696-bug-discord-alert-on-update-uses-the-old-version-not-the-new-one
2 parents 6580b89 + fc5e723 commit 24183e7

File tree

180 files changed

+1725
-87
lines changed

Some content is hidden

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

180 files changed

+1725
-87
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
"vscode": {
1717
"extensions": [
1818
"DavidAnson.vscode-markdownlint",
19+
"editorconfig.editorconfig",
20+
"esbenp.prettier-vscode",
1921
"github.vscode-github-actions",
2022
"GitHub.vscode-pull-request-github",
21-
"hashicorp.terraform",
22-
"ms-azuretools.vscode-azureterraform",
2323
"redhat.vscode-yaml",
2424
"timonwong.shellcheck",
2525
"yzhang.markdown-all-in-one"
2626
]
2727
}
28-
}
28+
},
29+
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
2930
}

.editorconfig

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
2-
# Atom: Please assure your Atom's config setting Tab Type is set to auto, otherwise Atom-EditorConfig may not work as expected. Also disable whitespace package.
32
# http://editorconfig.org/
43

54
root = true
65

76
[*]
87
charset = utf-8
9-
indent_style = tab
10-
indent_size = 4
11-
trim_trailing_whitespace = true
128
end_of_line = lf
13-
insert_final_newline = true
14-
15-
# YAML Files
16-
[*.{yml,yaml}]
17-
indent_size = 2
18-
indent_style = space
19-
20-
# JSON Files
21-
[*.{json,json5,webmanifest}]
229
indent_size = 2
2310
indent_style = space
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
2413

2514
# BASH Files
2615
[*.{.sh}]
27-
indent_style = tab
2816
indent_size = 4
17+
indent_style = tab

.github/FUNDING.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
# These are supported funding model platforms
2-
3-
github: dgibbs64 # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4-
patreon: dgibbs # Replace with a single Patreon username
5-
open_collective: # Replace with a single Open Collective username
6-
ko_fi: # Replace with a single Ko-fi username
7-
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8-
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9-
liberapay: # Replace with a single Liberapay username
10-
issuehunt: # Replace with a single IssueHunt username
11-
otechie: # Replace with a single Otechie username
12-
custom: # Replace with a single custom sponsorship URL
1+
github: dgibbs64
2+
patreon: dgibbs

.github/dependabot.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
# Set update schedule for GitHub Actions
21
version: 2
32
updates:
43
- package-ecosystem: "github-actions"
54
directory: "/"
65
schedule:
7-
# Check for updates to GitHub Actions every weekday
8-
interval: "daily"
6+
interval: "weekly"
7+
8+
- package-ecosystem: "devcontainers"
9+
directory: "/"
10+
schedule:
11+
interval: weekly
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Prettier
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- "*"
8+
9+
concurrency:
10+
group: prettier-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
permissions:
14+
contents: write
15+
16+
jobs:
17+
prettier:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v5
23+
with:
24+
persist-credentials: false
25+
26+
- name: Install Prettier and plugins
27+
run: |
28+
npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template
29+
30+
- name: Prettify code
31+
uses: creyD/[email protected]
32+
with:
33+
prettier_plugins: "prettier-plugin-sh prettier-plugin-jinja-template"
34+
prettier_options: --write .
35+
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
commit_message: "chore(prettier): format code"
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Super Linter
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- "*"
8+
9+
concurrency:
10+
group: super-linter-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
permissions: {}
14+
15+
jobs:
16+
build:
17+
name: Lint
18+
runs-on: ubuntu-latest
19+
20+
permissions:
21+
contents: read
22+
packages: read
23+
# To report GitHub Actions status checks
24+
statuses: write
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v5
29+
with:
30+
# super-linter needs the full git history to get the
31+
# list of files that changed across commits
32+
fetch-depth: 0
33+
persist-credentials: false
34+
35+
- name: Install Prettier plugins (for summary formatting)
36+
run: |
37+
npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template || true
38+
39+
- name: Super-linter
40+
uses: super-linter/super-linter@v8
41+
env:
42+
# To report GitHub Actions status checks
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
45+
VALIDATE_JSCPD: false
46+
VALIDATE_JSON_PRETTIER: false
47+
VALIDATE_MARKDOWN_PRETTIER: false
48+
VALIDATE_NATURAL_LANGUAGE: false
49+
VALIDATE_SHELL_SHFMT: false
50+
VALIDATE_TERRAFORM_TERRASCAN: false
51+
VALIDATE_YAML_PRETTIER: false
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Update copyright year(s) in license file
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 3 1 1 *" # 03:00 AM on January 1
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
update-license-year:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v5
17+
with:
18+
fetch-depth: 0
19+
persist-credentials: false
20+
- name: Action Update License Year
21+
uses: FantasticFiasco/action-update-license-year@v3
22+
with:
23+
token: ${{ secrets.GITHUB_TOKEN }}
24+
path: LICENSE.md
25+
- name: Merge pull request
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
run: |
29+
gh pr merge --merge --delete-branch

.github/workflows/trigger-docker-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Trigger Docker Build
2+
23
on:
4+
workflow_dispatch:
35
release:
46
types:
57
- published
@@ -16,7 +18,7 @@ jobs:
1618
owner: GameServerManagers
1719
repo: docker-linuxgsm
1820
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
19-
workflow_file_name: docker-publish.yml
21+
workflow_file_name: action-docker-publish.yml
2022

2123
trigger_build_docker-gameserver:
2224
if: github.repository_owner == 'GameServerManagers'
@@ -30,4 +32,4 @@ jobs:
3032
owner: GameServerManagers
3133
repo: docker-gameserver
3234
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
33-
workflow_file_name: docker-publish.yml
35+
workflow_file_name: action-docker-publish.yml

.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
.vscode/settings.json
2-
/node_modules
1+
# Visual Studio Code
2+
.vscode/*
3+
!.vscode/tasks.json
4+
!.vscode/launch.json
5+
!.vscode/extensions.json
6+
!.vscode/*.code-snippets
7+
.history/
8+
*.vsix
9+
10+
# Node.js
11+
node_modules

.prettierrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"plugins": ["prettier-plugin-sh"]
3+
}

0 commit comments

Comments
 (0)