From 70702889d05eb427b3d646efc02a5d22a4987524 Mon Sep 17 00:00:00 2001
From: seaubot <seaubot@users.noreply.github.com>
Date: Fri, 17 May 2024 17:53:59 +0000
Subject: [PATCH] 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..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 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$"]