Skip to content

chore: sync with ecsact_common #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,44 @@
name: main

on:
push:
branches:
- "**"
pull_request:
merge_group:

jobs:
typos-check:
name: Typos Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: crate-ci/[email protected]

formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: jidicula/clang-format-action@v4.9.0
with: { clang-format-version: "16" }
- uses: jidicula/clang-format-action@v4.11.0
with: { clang-format-version: "18" }

test-windows:
runs-on: windows-latest
steps:
- name: Ecsact SDK
uses: ecsact-dev/[email protected]
- uses: actions/cache@v3
- 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 --output_user_root=C:/tmp build --config=ci //...
- run: bazelisk build --config=ci //...
- if: ${{ hashfiles('test/MODULE.bazel') != '' }}
run: bazelisk --output_user_root=C:/tmp test --config=ci ...
run: bazelisk test --config=ci ...
working-directory: test

test-linux:
runs-on: ubuntu-latest
steps:
- name: Ecsact SDK
uses: ecsact-dev/[email protected]
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.cache/bazelisk
Expand Down
3 changes: 0 additions & 3 deletions bazel/common.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ build --enable_runfiles
build --noincompatible_remove_rule_name_parameter
query --noincompatible_remove_rule_name_parameter

# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux

common:ci --announce_rc
common:ci --verbose_failures
common:ci --keep_going
Expand Down
2 changes: 1 addition & 1 deletion bazel/copts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ copts = selects.with_or({
"-fexperimental-library",
],
("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [
"/std:c++latest",
"/std:c++20",
"/permissive-",
"/Zc:preprocessor",
],
Expand Down
15 changes: 9 additions & 6 deletions rt_entt_codegen/core/print_sys_exec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,9 @@ static auto print_sys_exec_ctx_generate(
});
}

static auto print_sys_exec_ctx_parent(ecsact::codegen_plugin_context& ctx)
-> void {
static auto print_sys_exec_ctx_parent( //
ecsact::codegen_plugin_context& ctx
) -> void {
using ecsact::rt_entt_codegen::util::method_printer;

auto printer = //
Expand Down Expand Up @@ -761,17 +762,19 @@ static auto get_unique_view_name() -> std::string {
}

template<typename ComponentLikeID>
static auto create_context_struct_name(ComponentLikeID component_like_id)
-> std::string {
static auto create_context_struct_name( //
ComponentLikeID component_like_id
) -> std::string {
using ecsact::cc_lang_support::c_identifier;
auto full_name =
c_identifier(ecsact::meta::decl_full_name(component_like_id));
return full_name + "Struct";
}

template<typename ComponentLikeID>
static auto create_context_var_name(ComponentLikeID component_like_id)
-> std::string {
static auto create_context_var_name( //
ComponentLikeID component_like_id
) -> std::string {
using ecsact::cc_lang_support::c_identifier;
auto full_name =
c_identifier(ecsact::meta::decl_full_name(component_like_id));
Expand Down
5 changes: 5 additions & 0 deletions typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[files]
extend-exclude = ["CHANGELOG.md"]

[default]
extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]