mirror of
https://github.com/godotengine/godot.git
synced 2025-10-19 16:03:29 +00:00
Style: Minor pre-commit & yaml
adjustments
This commit is contained in:
parent
efa144396d
commit
048f8442e3
7 changed files with 36 additions and 58 deletions
|
@ -88,7 +88,7 @@ BreakConstructorInitializers: AfterColon
|
||||||
# BreakInheritanceList: BeforeColon
|
# BreakInheritanceList: BeforeColon
|
||||||
# BreakStringLiterals: true
|
# BreakStringLiterals: true
|
||||||
ColumnLimit: 0
|
ColumnLimit: 0
|
||||||
# CommentPragmas: '^ IWYU pragma:'
|
# CommentPragmas: "^ IWYU pragma:"
|
||||||
# CompactNamespaces: false
|
# CompactNamespaces: false
|
||||||
ConstructorInitializerIndentWidth: 8
|
ConstructorInitializerIndentWidth: 8
|
||||||
ContinuationIndentWidth: 8
|
ContinuationIndentWidth: 8
|
||||||
|
@ -114,7 +114,7 @@ IncludeCategories:
|
||||||
- Regex: ^<.*>$
|
- Regex: ^<.*>$
|
||||||
Priority: 3
|
Priority: 3
|
||||||
# IncludeIsMainRegex: (Test)?$
|
# IncludeIsMainRegex: (Test)?$
|
||||||
# IncludeIsMainSourceRegex: ''
|
# IncludeIsMainSourceRegex: ""
|
||||||
# IndentAccessModifiers: false
|
# IndentAccessModifiers: false
|
||||||
# IndentCaseBlocks: false
|
# IndentCaseBlocks: false
|
||||||
IndentCaseLabels: true
|
IndentCaseLabels: true
|
||||||
|
@ -149,8 +149,8 @@ KeepEmptyLinesAtTheStartOfBlocks: false
|
||||||
# LambdaBodyIndentation: Signature
|
# LambdaBodyIndentation: Signature
|
||||||
# Language: Cpp
|
# Language: Cpp
|
||||||
# LineEnding: DeriveLF
|
# LineEnding: DeriveLF
|
||||||
# MacroBlockBegin: ''
|
# MacroBlockBegin: ""
|
||||||
# MacroBlockEnd: ''
|
# MacroBlockEnd: ""
|
||||||
# MaxEmptyLinesToKeep: 1
|
# MaxEmptyLinesToKeep: 1
|
||||||
# NamespaceIndentation: None
|
# NamespaceIndentation: None
|
||||||
# ObjCBinPackProtocolList: Auto
|
# ObjCBinPackProtocolList: Auto
|
||||||
|
|
|
@ -7,7 +7,7 @@ Checks:
|
||||||
- modernize-use-nullptr
|
- modernize-use-nullptr
|
||||||
- readability-braces-around-statements
|
- readability-braces-around-statements
|
||||||
- readability-redundant-member-init
|
- readability-redundant-member-init
|
||||||
HeaderFileExtensions: ['', h, hh, hpp, hxx, inc, glsl]
|
HeaderFileExtensions: ["", h, hh, hpp, hxx, inc, glsl]
|
||||||
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
|
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
|
||||||
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
|
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
|
||||||
FormatStyle: file
|
FormatStyle: file
|
||||||
|
|
2
.github/actions/godot-build/action.yml
vendored
2
.github/actions/godot-build/action.yml
vendored
|
@ -14,7 +14,7 @@ inputs:
|
||||||
required: false
|
required: false
|
||||||
sconsflags:
|
sconsflags:
|
||||||
description: Additional SCons flags.
|
description: Additional SCons flags.
|
||||||
default: ''
|
default: ""
|
||||||
required: false
|
required: false
|
||||||
scons-cache:
|
scons-cache:
|
||||||
description: The SCons cache path.
|
description: The SCons cache path.
|
||||||
|
|
4
.github/workflows/linux_builds.yml
vendored
4
.github/workflows/linux_builds.yml
vendored
|
@ -129,7 +129,7 @@ jobs:
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
|
||||||
- name: Setup Python and SCons
|
- name: Setup Python and SCons
|
||||||
if: '!matrix.legacy-scons'
|
if: "!matrix.legacy-scons"
|
||||||
uses: ./.github/actions/godot-deps
|
uses: ./.github/actions/godot-deps
|
||||||
|
|
||||||
- name: Setup Python and SCons (legacy versions)
|
- name: Setup Python and SCons (legacy versions)
|
||||||
|
@ -150,7 +150,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
# Targeting the oldest version we want to support to ensure it still builds.
|
# Targeting the oldest version we want to support to ensure it still builds.
|
||||||
dotnet-version: '8.0.100'
|
dotnet-version: 8.0.100
|
||||||
|
|
||||||
- name: Compilation
|
- name: Compilation
|
||||||
uses: ./.github/actions/godot-build
|
uses: ./.github/actions/godot-build
|
||||||
|
|
2
.github/workflows/runner.yml
vendored
2
.github/workflows/runner.yml
vendored
|
@ -9,7 +9,7 @@ jobs:
|
||||||
# First stage: Only static checks, fast and prevent expensive builds from running.
|
# First stage: Only static checks, fast and prevent expensive builds from running.
|
||||||
|
|
||||||
static-checks:
|
static-checks:
|
||||||
if: '!vars.DISABLE_GODOT_CI'
|
if: "!vars.DISABLE_GODOT_CI"
|
||||||
name: 📊 Static checks
|
name: 📊 Static checks
|
||||||
uses: ./.github/workflows/static_checks.yml
|
uses: ./.github/workflows/static_checks.yml
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,10 @@ default_language_version:
|
||||||
exclude: |
|
exclude: |
|
||||||
(?x)^(
|
(?x)^(
|
||||||
.*thirdparty/.*|
|
.*thirdparty/.*|
|
||||||
.*-so_wrap\.(h|c)$
|
.*-so_wrap\.(h|c)|
|
||||||
)
|
platform/android/java/editor/src/main/java/com/android/.*|
|
||||||
|
platform/android/java/lib/src/com/google/.*
|
||||||
|
)$
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||||
|
@ -14,23 +16,13 @@ repos:
|
||||||
- id: clang-format
|
- id: clang-format
|
||||||
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java)$
|
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java)$
|
||||||
types_or: [text]
|
types_or: [text]
|
||||||
exclude: |
|
exclude: ^tests/python_build/.*
|
||||||
(?x)^(
|
|
||||||
tests/python_build/.*|
|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
|
||||||
platform/android/java/lib/src/com/.*
|
|
||||||
)
|
|
||||||
- id: clang-format
|
- id: clang-format
|
||||||
name: clang-format-glsl
|
name: clang-format-glsl
|
||||||
files: \.glsl$
|
files: \.glsl$
|
||||||
types_or: [text]
|
types_or: [text]
|
||||||
exclude: |
|
exclude: ^tests/python_build/.*
|
||||||
(?x)^(
|
args: [-style=file:misc/utility/clang_format_glsl.yml]
|
||||||
tests/python_build/.*|
|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
|
||||||
platform/android/java/lib/src/com/.*
|
|
||||||
)
|
|
||||||
args: ['-style=file:misc/utility/.clang-format-glsl']
|
|
||||||
|
|
||||||
- repo: https://github.com/pocc/pre-commit-hooks
|
- repo: https://github.com/pocc/pre-commit-hooks
|
||||||
rev: v1.3.5
|
rev: v1.3.5
|
||||||
|
@ -39,12 +31,7 @@ repos:
|
||||||
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
|
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
|
||||||
args: [--fix, --quiet, --use-color]
|
args: [--fix, --quiet, --use-color]
|
||||||
types_or: [text]
|
types_or: [text]
|
||||||
exclude: |
|
exclude: ^tests/python_build/.*
|
||||||
(?x)^(
|
|
||||||
tests/python_build/.*|
|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
|
||||||
platform/android/java/lib/src/com/.*
|
|
||||||
)
|
|
||||||
additional_dependencies: [clang-tidy==19.1.0]
|
additional_dependencies: [clang-tidy==19.1.0]
|
||||||
require_serial: true
|
require_serial: true
|
||||||
stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
|
stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
|
||||||
|
@ -71,11 +58,6 @@ repos:
|
||||||
rev: v2.3.0
|
rev: v2.3.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: codespell
|
- id: codespell
|
||||||
exclude: |
|
|
||||||
(?x)^(
|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
|
||||||
platform/android/java/lib/src/com/.*
|
|
||||||
)
|
|
||||||
additional_dependencies: [tomli]
|
additional_dependencies: [tomli]
|
||||||
|
|
||||||
### Requires Docker; look into alternative implementation.
|
### Requires Docker; look into alternative implementation.
|
||||||
|
@ -118,10 +100,10 @@ repos:
|
||||||
- --config
|
- --config
|
||||||
- platform/web/eslint.config.cjs
|
- platform/web/eslint.config.cjs
|
||||||
additional_dependencies:
|
additional_dependencies:
|
||||||
- '@eslint/js@^9.3.0'
|
- "@eslint/js@^9.3.0"
|
||||||
- '@html-eslint/eslint-plugin@^0.24.1'
|
- "@html-eslint/eslint-plugin@^0.24.1"
|
||||||
- '@html-eslint/parser@^0.24.1'
|
- "@html-eslint/parser@^0.24.1"
|
||||||
- '@stylistic/eslint-plugin@^2.1.0'
|
- "@stylistic/eslint-plugin@^2.1.0"
|
||||||
- eslint@^9.3.0
|
- eslint@^9.3.0
|
||||||
- eslint-plugin-html@^8.1.1
|
- eslint-plugin-html@^8.1.1
|
||||||
- globals@^15.3.0
|
- globals@^15.3.0
|
||||||
|
@ -139,7 +121,7 @@ repos:
|
||||||
- platform/web/js/engine/config.js
|
- platform/web/js/engine/config.js
|
||||||
- platform/web/js/engine/features.js
|
- platform/web/js/engine/features.js
|
||||||
- --destination
|
- --destination
|
||||||
- ''
|
- ""
|
||||||
- -d
|
- -d
|
||||||
- dry-run
|
- dry-run
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
|
@ -160,14 +142,12 @@ repos:
|
||||||
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java)$
|
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java)$
|
||||||
exclude: |
|
exclude: |
|
||||||
(?x)^(
|
(?x)^(
|
||||||
core/math/bvh_.*\.inc$|
|
core/math/bvh_.*\.inc|
|
||||||
platform/(?!android|ios|linuxbsd|macos|web|windows)\w+/.*|
|
platform/(?!android|ios|linuxbsd|macos|web|windows)\w+/.*|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView\.java|
|
||||||
platform/android/java/lib/src/com/.*|
|
platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper\.java|
|
||||||
platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView\.java$|
|
platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix\.java
|
||||||
platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper\.java$|
|
)$
|
||||||
platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix\.java$
|
|
||||||
)
|
|
||||||
|
|
||||||
- id: header-guards
|
- id: header-guards
|
||||||
name: header-guards
|
name: header-guards
|
||||||
|
@ -183,17 +163,15 @@ repos:
|
||||||
types_or: [text]
|
types_or: [text]
|
||||||
exclude: |
|
exclude: |
|
||||||
(?x)^(
|
(?x)^(
|
||||||
.*\.test\.txt$|
|
.*\.test\.txt|
|
||||||
.*\.svg$|
|
.*\.svg|
|
||||||
.*\.patch$|
|
.*\.patch|
|
||||||
.*\.out$|
|
.*\.out|
|
||||||
modules/gdscript/tests/scripts/parser/features/mixed_indentation_on_blank_lines\.gd$|
|
modules/gdscript/tests/scripts/parser/features/mixed_indentation_on_blank_lines\.gd|
|
||||||
modules/gdscript/tests/scripts/parser/warnings/empty_file_newline_comment\.norun\.gd$|
|
modules/gdscript/tests/scripts/parser/warnings/empty_file_newline_comment\.norun\.gd|
|
||||||
modules/gdscript/tests/scripts/parser/warnings/empty_file_newline\.norun\.gd$|
|
modules/gdscript/tests/scripts/parser/warnings/empty_file_newline\.norun\.gd|
|
||||||
platform/android/java/editor/src/main/java/com/android/.*|
|
tests/data/.*\.bin
|
||||||
platform/android/java/lib/src/com/google/.*|
|
)$
|
||||||
tests/data/.*\.bin$
|
|
||||||
)
|
|
||||||
|
|
||||||
- id: dotnet-format
|
- id: dotnet-format
|
||||||
name: dotnet-format
|
name: dotnet-format
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue