Skip to content

Commit

Permalink
Merge branch 'dev' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
DavideRei authored Jun 30, 2024
2 parents bb2208f + 32c3a0e commit 1e0672a
Show file tree
Hide file tree
Showing 492 changed files with 53,778 additions and 45,957 deletions.
16 changes: 16 additions & 0 deletions .cmake-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# https://cmake-format.readthedocs.io/en/latest/
#https://github.com/bouncmpe/cpp-project-template/blob/main/.cmake-format
format:
line_width: 80
tab_size: 2
max_subgroups_hwrap: 2
max_pargs_hwrap: 6
max_rows_cmdline: 2
dangle_parens: true
dangle_align: 'prefix'
min_prefix_chars: 8
max_prefix_chars: 8
max_lines_hwrap: 2
command_case: 'lower'
markup:
enable_markup: false
49 changes: 44 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,56 @@ root = true
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true

# Tab indentation (no size specified)
[Makefile]
indent_style = tab

[*.{c,h,cpp,hpp}]
[*.{c,h,cpp,cxx,hpp}]
charset = utf-8
indent_size = 4
indent_style = space
cpp_indent_case_contents_when_block = true
cpp_new_line_before_open_brace_namespace = same_line
cpp_indent_namespace_contents = true
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
cpp_new_line_before_open_brace_namespace = new_line
cpp_indent_preserve_comments = true
cpp_indent_namespace_contents = false
cpp_indent_case_labels = true
cpp_indent_case_contents = false
cpp_indent_case_contents_when_block = false
cpp_allow_comment_after_lbrace = true
cpp_simple_block_style = do_not_change
cpp_space_before_function_open_parenthesis = remove
cpp_space_within_parameter_list_parentheses = false
cpp_space_between_empty_parameter_list_parentheses = false
cpp_space_after_keywords_in_control_flow_statements = true
cpp_space_within_control_flow_statement_parentheses = false
cpp_space_before_lambda_open_parenthesis = false
cpp_space_within_cast_parentheses = false
cpp_space_after_cast_close_parenthesis = false
cpp_space_within_expression_parentheses = false
cpp_space_before_initializer_list_open_brace = false
cpp_space_within_initializer_list_braces = true
cpp_space_before_open_square_bracket = false
cpp_space_within_square_brackets = false
cpp_space_before_empty_square_brackets = false
cpp_space_between_empty_square_brackets = false
cpp_space_group_square_brackets = true
cpp_space_within_lambda_brackets = false
cpp_space_between_empty_lambda_brackets = false
cpp_space_before_comma = false
cpp_space_after_comma = true
cpp_space_remove_around_member_operators = false
cpp_space_before_inheritance_colon = true
cpp_space_before_constructor_colon = true
cpp_space_remove_before_semicolon = true
cpp_space_after_semicolon = false
cpp_space_remove_around_unary_operator = false
cpp_space_around_binary_operator = ignore
cpp_space_around_assignment_operator = insert
cpp_space_pointer_reference_alignment = ignore
cpp_space_around_ternary_operator = insert
17 changes: 17 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#https://stackoverflow.com/questions/20496084/git-status-ignore-line-endings-in-identical-files-on-windows-linux

# Set the default behavior for all files.
* text=auto

# Normalize and convert to native line endings on checkout.
*.c text
*.cpp text
*.h text
*.hpp text

# Ignore all differences in line endings.
* -crlf

# Convert to LF line endings on checkout.
#* text eol=lf

258 changes: 0 additions & 258 deletions .github/workflows/build.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/build_aux_files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Create/upload auxiliary files to the release.

on:
- push

jobs:
upload_github_release:
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)

runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Generate changelog
run: git log --pretty=format:"%ad %an %s" --date=short > Git-Changelog.txt

- name: Add auxiliary files to the release
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
name: Nightly
tag_name: Nightly
prerelease: true
files: Git-Changelog.txt
Loading

0 comments on commit 1e0672a

Please sign in to comment.