From 44edb2c4b7afca62359124278f8c895087787173 Mon Sep 17 00:00:00 2001 From: seaubot Date: Fri, 17 May 2024 17:54:11 +0000 Subject: [PATCH 1/3] chore: sync with ecsact_common --- .editorconfig | 6 ++ .github/workflows/main.yml | 113 +++++++++++++++++++------------------ bazel/common.bazelrc | 1 - 3 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..13fd15e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,6 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true + diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea4cd56..9da7aac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,56 +1,57 @@ -# This file is maintained by ecsact-dev/ecsact_common -# If changes are required please make them there - -name: main - -on: - pull_request: - merge_group: - -jobs: - typos-check: - name: Typos Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: crate-ci/typos@v1.19.0 - - formatting-check: - name: Formatting Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: jidicula/clang-format-action@v4.11.0 - with: { clang-format-version: "18" } - - test-windows: - if: github.event_name == 'merge_group' - runs-on: windows-latest - steps: - - uses: actions/cache@v4 - with: - path: | - /Users/runneradmin/AppData/Local/bazelisk - /Users/runneradmin/.cache/bazel-disk-cache - key: ${{runner.os}}-bazel-cache - - uses: actions/checkout@v4 - - run: bazelisk build --config=ci //... - - if: ${{ hashfiles('test/MODULE.bazel') != '' }} - run: bazelisk test --config=ci ... - working-directory: test - - test-linux: - if: github.event_name == 'merge_group' - runs-on: ubuntu-latest - steps: - - uses: actions/cache@v4 - with: - path: | - ~/.cache/bazelisk - ~/.cache/bazel-disk-cache - key: ${{runner.os}}-bazel-cache - - uses: actions/checkout@v4 - - run: bazelisk build --config=ci //... - - if: ${{ hashfiles('test/MODULE.bazel') != '' }} - run: bazelisk test --config=ci ... - working-directory: test +# This file is maintained by ecsact-dev/ecsact_common +# If changes are required please make them there + +name: main + +on: + pull_request: + merge_group: + +jobs: + typos-check: + name: Typos Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: crate-ci/typos@v1.19.0 + + formatting-check: + name: Formatting Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: greut/eclint-action@v0 + - uses: jidicula/clang-format-action@v4.11.0 + with: { clang-format-version: "18" } + + test-windows: + if: github.event_name == 'merge_group' + runs-on: windows-latest + steps: + - uses: actions/cache@v4 + with: + path: | + /Users/runneradmin/AppData/Local/bazelisk + /Users/runneradmin/.cache/bazel-disk-cache + key: ${{runner.os}}-bazel-cache + - uses: actions/checkout@v4 + - run: bazelisk build --config=ci //... + - if: ${{ hashfiles('test/MODULE.bazel') != '' }} + run: bazelisk test --config=ci ... + working-directory: test + + test-linux: + if: github.event_name == 'merge_group' + runs-on: ubuntu-latest + steps: + - uses: actions/cache@v4 + with: + path: | + ~/.cache/bazelisk + ~/.cache/bazel-disk-cache + key: ${{runner.os}}-bazel-cache + - uses: actions/checkout@v4 + - run: bazelisk build --config=ci //... + - if: ${{ hashfiles('test/MODULE.bazel') != '' }} + run: bazelisk test --config=ci ... + working-directory: test diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index 9c8eb86..2de0b25 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -1,7 +1,6 @@ startup --windows_enable_symlinks common --enable_bzlmod common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main -common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary common --registry=https://raw.githubusercontent.com/bazelboost/registry/main common --registry=https://bcr.bazel.build build --enable_platform_specific_config From 3ecc83055b45b88f37a2a31fda92c4c2cbf059c4 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Fri, 17 May 2024 11:18:46 -0700 Subject: [PATCH 2/3] chore: eclint stuff --- .vscode/launch.json | 25 ------------------------- .vscode/settings.json | 32 -------------------------------- .vscode/tasks.json | 25 ------------------------- CHANGELOG.md | 2 +- bazel/common.bazelrc | 1 + renovate.json | 2 +- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 9abd91f..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "test //runtime/test:test", - "request": "launch", - "program": "${workspaceFolder}/bazel-bin/runtime/test/test", - "cwd": "${workspaceFolder}", - "args": [ - "--gtest_catch_exceptions", - // "--gtest_break_on_failure", - ], - "type": "cppvsdbg", - "windows": { - "type": "cppvsdbg", - "program": "${workspaceFolder}/bazel-bin/runtime/test/test.exe" - }, - "preLaunchTask": "build //runtime/test:test", - "sourceFileMap": { - "C:/users/austin/_bazel_austin/ohk2m3f2/execroot/ecsact_rt_entt": "${workspaceFolder}" - } - } - ], - "compounds": [] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3f2272d..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "editor.formatOnSave": true, - "files.insertFinalNewline": true, - "files.eol": "\n", - "editor.insertSpaces": false, - "files.associations": {}, - "editor.wordWrap": "wordWrapColumn", - "C_Cpp.autocomplete": "default", - "C_Cpp.autoAddFileAssociations": false, - "C_Cpp.default.compileCommands": "${workspaceFolder}/compile_commands.json", - "lldb.launch.sourceMap": { - "/proc/self/cwd": "${workspaceFolder}" - }, - "[json]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[jsonc]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[markdown]": { - "editor.defaultFormatter": "DavidAnson.vscode-markdownlint" - }, - "[cpp]": { - "editor.detectIndentation": false, - "editor.defaultFormatter": "Seaube.ClangFormat" - }, - "[starlark]": { - "editor.defaultFormatter": "BazelBuild.vscode-bazel", - "editor.insertSpaces": true, - "editor.detectIndentation": false - } -} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index c2c50eb..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "Refresh compile_commands.json", - "command": "bazel", - "type": "shell", - "args": [ - "run", - "@hedron_compile_commands//:refresh_all" - ], - "problemMatcher": [] - }, - { - "label": "build //runtime/test:test", - "command": "bazel", - "type": "shell", - "args": [ - "build", - "//runtime/test:test" - ], - "group": "build" - } - ] -} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ab6521..6f335d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,4 +71,4 @@ All notable changes to this project will be documented in this file. See [conven - - - -Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto). \ No newline at end of file +Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto). diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index 2de0b25..9c8eb86 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -1,6 +1,7 @@ startup --windows_enable_symlinks common --enable_bzlmod common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main +common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary common --registry=https://raw.githubusercontent.com/bazelboost/registry/main common --registry=https://bcr.bazel.build build --enable_platform_specific_config diff --git a/renovate.json b/renovate.json index fa1abeb..25b1be3 100644 --- a/renovate.json +++ b/renovate.json @@ -3,4 +3,4 @@ "extends": [ "github>ecsact-dev/renovate-config" ] -} \ No newline at end of file +} From 2fb8d11b98aa188d6810f0e1cdeeb6750537905d Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Fri, 17 May 2024 11:21:43 -0700 Subject: [PATCH 3/3] chore: eclint stuff --- .editorconfig | 12 ++++++------ .gitignore | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index 13fd15e..9b1aeae 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ -root = true - -[*] -end_of_line = lf -insert_final_newline = true - +root = true + +[*] +end_of_line = lf +insert_final_newline = true + diff --git a/.gitignore b/.gitignore index aec440b..e7bb2b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -bazel-* -user.bazelrc -*.bazel.lock -compile_commands.json -external -.cache -/test/codegen_test +bazel-* +user.bazelrc +*.bazel.lock +compile_commands.json +external +.cache +/test/codegen_test