Skip to content

Commit

Permalink
Merge dev into rc
Browse files Browse the repository at this point in the history
Former-commit-id: f4cd7a5
  • Loading branch information
C0kkie authored Nov 14, 2021
2 parents a1d4a31 + 7e852ab commit 76915e8
Show file tree
Hide file tree
Showing 109 changed files with 12,311 additions and 9,927 deletions.
98 changes: 98 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
---
BasedOnStyle: LLVM
IndentWidth: 4
---
Language: Cpp
ColumnLimit: 190
AccessModifierOffset: 0
AlignAfterOpenBracket: true
#AlignConsecutiveAssignments: true
AlignConsecutiveBitFields: true
#AlignConsecutiveDeclarations: true
AlignConsecutiveMacros: true
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Always
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: true
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
#BitFieldColonSpacing: Both
BraceWrapping: Custom
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: MultiLine
AfterEnum: true
AfterFunction: true
AfterNamespace: false
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: BeforeColon
BreakStringLiterals: false
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ContinuationIndentWidth: 2
Cpp11BracedListStyle: false
#EmptyLineAfterAccessModifier: Never
#EmptyLineBeforeAccessModifier: LogicalBlock
FixNamespaceComments: true
#IncludeBlocks: Regroup
#IndentAccessModifiers: false
AccessModifierOffset: -4
IndentCaseBlocks: false
IndentCaseLabels: true
IndentExternBlock: true
IndentGotoLabels: false
IndentPPDirectives: BeforeHash
IndentWrappedFunctionNames: true
InsertTrailingCommas: None
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
PointerAlignment: Left
#ShortNamespaceLines: 0
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
#SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true
#SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: Never
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInConditionalStatement: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++17
DeriveLineEnding: true
UseTab: Never
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
33 changes: 0 additions & 33 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Bug report
description: Report a bug in the module
labels: ['type: bug']

body:
- type: textarea
id: description
attributes:
label: Description of the problem
description: Describe the exact problem.
placeholder: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproduction steps
description: Describe how to reproduce the problem
placeholder: A clear and concise list of steps on how to reproduce the problem or code to reproduce the problem.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected behaviour
description: Describe the expected behaviour
placeholder: A clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
id: context
attributes:
label: Additional context
description: Any other additional context you'd like to add
placeholder: Add any other context or screenshots about the problem here.
- type: input
id: os
attributes:
label: Operating system
description: On what operating system is the issue present
placeholder: E.g. Ubuntu 20.04
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: On what version is the issue present
placeholder: e.g. dev/7.0-dev3
validations:
required: true
- type: dropdown
id: scope
attributes:
label: Scope
description: Select which scopes are affected by the issue
multiple: true
options:
- shared
- server
- client
- docs
validations:
required: true
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

56 changes: 56 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Feature request
description: Suggest an idea for this project
labels: ['type: enhancement']

body:
- type: textarea
id: description
attributes:
label: Description of the problem
description: Is your feature request related to a problem? Please describe
placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
id: solution
attributes:
label: Desired solution for the problem
description: Describe the solution you'd like
placeholder: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Alternatives you considered
description: Describe alternatives you've considered
placeholder: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: context
attributes:
label: Additional context
description: Any other additional context you'd like to add
placeholder: Add any other context or screenshots about the feature request here.
- type: input
id: version
attributes:
label: Version
description: On what version is the issue present
placeholder: e.g. dev/7.0-dev3
validations:
required: false
- type: dropdown
id: scope
attributes:
label: Scope
description: Select which scopes are affected by the issue
multiple: true
options:
- shared
- server
- client
- docs
validations:
required: true
38 changes: 31 additions & 7 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build & deploy server
on:
push:
branches-ignore:
branches-ignore:
- '**'
tags:
- 'dev/*.*-dev*'
Expand All @@ -17,7 +17,19 @@ jobs:
uses: actions/checkout@v2
with:
submodules: recursive
lfs: true

- name: Create LFS file list
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id

- name: Restore LFS cache
uses: actions/cache@v2
id: lfs-cache
with:
path: .git/lfs
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1

- name: Git LFS Pull
run: git lfs pull

- name: Extract version
id: version
Expand Down Expand Up @@ -55,7 +67,19 @@ jobs:
uses: actions/checkout@v2
with:
submodules: recursive
lfs: true

- name: Create LFS file list
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id

- name: Restore LFS cache
uses: actions/cache@v2
id: lfs-cache
with:
path: .git/lfs
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1

- name: Git LFS Pull
run: git lfs pull

- name: Extract version
id: version
Expand Down Expand Up @@ -101,13 +125,13 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}

- name: Download windows artifacts
uses: actions/download-artifact@v2
with:
name: js-module-windows
path: dist-windows

- name: Download linux artifacts
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -151,13 +175,13 @@ jobs:
with:
name: js-module-windows
path: dist-windows

- name: Download linux artifacts
uses: actions/download-artifact@v2
with:
name: js-module-linux
path: dist-linux

- name: Zip artifacts
run: |
zip -r -j js-module-windows dist-windows
Expand Down
Loading

0 comments on commit 76915e8

Please sign in to comment.