From d1164e4237d7af5c1fbeccf04b91819eae5c6854 Mon Sep 17 00:00:00 2001
From: seaubot <seaubot@users.noreply.github.com>
Date: Wed, 15 May 2024 17:14:56 +0000
Subject: [PATCH] chore: sync with ecsact_common

---
 .bazelversion              |  2 +-
 .github/workflows/main.yml | 13 +++++++++++--
 bazel/common.bazelrc       |  3 ---
 cog.toml                   |  1 +
 typos.toml                 |  5 +++++
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 typos.toml

diff --git a/.bazelversion b/.bazelversion
index 21c8c7b4..a8a18875 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.1.1
+7.1.2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 030d9576..159ff05d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,6 +8,13 @@ on:
   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
@@ -17,9 +24,10 @@ jobs:
         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
@@ -32,9 +40,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 50ddd64d..2de0b253 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 9cbba6c7..c7d273ca 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
new file mode 100644
index 00000000..3ffc3da3
--- /dev/null
+++ b/typos.toml
@@ -0,0 +1,5 @@
+[files]
+extend-exclude = ["CHANGELOG.md"]
+
+[default]
+extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]