chore: sync with ecsact_common (#38)

seaubot · zaucy · web-flow · commit 4720a0689806 · 2024-05-23T23:15:18.000Z
* chore: sync with ecsact_common

* chore: formatting

* chore: formatting

---------

Co-authored-by: seaubot &lt;seaubot@users.noreply.github.com&gt;
Co-authored-by: Ezekiel Warren &lt;ezekiel@seaube.com&gt;
diff --git a/.bazelignore b/.bazelignore
@@ -1 +1 @@
-test
+test
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.1.1
+7.1.2
diff --git a/.editorconfig 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
@@ -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/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).
+Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-<p align="center">
-	<img src="https://ecsact.dev/external/ecsact_logo/ecsact-color.png" width="300" />
-</p>
-
-# 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
-
+<p align="center">
+	<img src="https://ecsact.dev/external/ecsact_logo/ecsact-color.png" width="300" />
+</p>
+
+# 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
+
diff --git 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
@@ -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/renovate.json b/renovate.json
@@ -3,4 +3,4 @@
 	"extends": [
 		"github>ecsact-dev/renovate-config"
 	]
-}
+}
diff --git a/typos.toml b/typos.toml
@@ -1,2 +1,5 @@
 [files]
 extend-exclude = ["CHANGELOG.md"]
+
+[default]
+extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]

Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,4 @@ All notable changes to this project will be documented in this file. See [conven`
`88`	`88`
`89`	`89`	`- - -`
`90`	`90`
`91`		`-Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).`
	`91`	`+Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`pre_bump_hooks = [`
`2`	`2`	`# Ecsact pre 1.0.0 the 0.X.0 is our 'major' version`
`3`	`3`	`"buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module",`
	`4`	`+ "bazel mod tidy",`
`4`	`5`	`]`
`5`	`6`
`6`	`7`	`post_bump_hooks = [`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`"extends": [`
`4`	`4`	`"github>ecsact-dev/renovate-config"`
`5`	`5`	`]`
`6`		`-}`
	`6`	`+}`