From f4c69f4aeb821662e086e60b0ba1e8681ef6bad5 Mon Sep 17 00:00:00 2001 From: seaubot Date: Fri, 17 May 2024 18:58:56 +0000 Subject: [PATCH 1/3] chore: sync with ecsact_common --- .bazelversion | 2 +- .editorconfig | 6 ++++++ .github/workflows/main.yml | 12 +++++++----- bazel/common.bazelrc | 3 --- cog.toml | 1 + typos.toml | 3 +++ 6 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 .editorconfig diff --git a/.bazelversion b/.bazelversion index 21c8c7b..a8a1887 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.1.1 +7.1.2 diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9b1aeae --- /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 2dfc0dc..9da7aac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,8 @@ name: main on: - push: - branches: - - "**" + pull_request: + merge_group: jobs: typos-check: @@ -21,13 +20,15 @@ jobs: 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@v3 + - uses: actions/cache@v4 with: path: | /Users/runneradmin/AppData/Local/bazelisk @@ -40,9 +41,10 @@ jobs: working-directory: test test-linux: + if: github.event_name == 'merge_group' runs-on: ubuntu-latest steps: - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cache/bazelisk diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index 50ddd64..2de0b25 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -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 diff --git a/cog.toml b/cog.toml index 9cbba6c..c7d273c 100644 --- a/cog.toml +++ b/cog.toml @@ -1,6 +1,7 @@ pre_bump_hooks = [ # Ecsact pre 1.0.0 the 0.X.0 is our 'major' version "buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module", + "bazel mod tidy", ] post_bump_hooks = [ diff --git a/typos.toml b/typos.toml index bf27f28..3ffc3da 100644 --- a/typos.toml +++ b/typos.toml @@ -1,2 +1,5 @@ [files] extend-exclude = ["CHANGELOG.md"] + +[default] +extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"] From d31ef88859a845e92293d73ae70eb80335f842ac Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Thu, 23 May 2024 16:13:58 -0700 Subject: [PATCH 2/3] chore: formatting --- .bazelignore | 2 +- CHANGELOG.md | 2 +- renovate.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelignore b/.bazelignore index 30d74d2..9daeafb 100644 --- a/.bazelignore +++ b/.bazelignore @@ -1 +1 @@ -test \ No newline at end of file +test diff --git a/CHANGELOG.md b/CHANGELOG.md index 084646e..31cdfb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,4 +88,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/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 ed29d37c314b4718628e351223ebe1b077d8d65e Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Thu, 23 May 2024 16:14:46 -0700 Subject: [PATCH 3/3] chore: formatting --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e1b4bb5..28adfe8 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -

- -

- -# Ecsact Codegen - -NOTE: This repository is the new location for everything codegen related. Plugins will still live in their respective `ecsact_lang_*` repositories, but the plugin and build system related tools will be moved here. - - -## Migration progress - -- [x] ecsact_runtime bazel files -- [x] ecsact_runtime codegen related headers -- [x] ecsact_runtime plugin test code -- [ ] ecsact_cli codegen API - +

+ +

+ +# Ecsact Codegen + +NOTE: This repository is the new location for everything codegen related. Plugins will still live in their respective `ecsact_lang_*` repositories, but the plugin and build system related tools will be moved here. + + +## Migration progress + +- [x] ecsact_runtime bazel files +- [x] ecsact_runtime codegen related headers +- [x] ecsact_runtime plugin test code +- [ ] ecsact_cli codegen API +