From 3de9dc1eeb5567b54b0b1ef3f65b12584ba2da3a Mon Sep 17 00:00:00 2001
From: seaubot <81010316+seaubot@users.noreply.github.com>
Date: Fri, 21 Jun 2024 08:19:10 -0700
Subject: [PATCH] chore: sync with ecsact_common (#240)

Co-authored-by: seaubot <seaubot@users.noreply.github.com>
---
 .bazelversion              |  2 +-
 .editorconfig              |  1 -
 .github/workflows/main.yml |  4 ++--
 bazel/common.bazelrc       |  1 +
 cog.toml                   | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index a8a18875..0ee843cc 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.1.2
+7.2.0
diff --git a/.editorconfig b/.editorconfig
index 9b1aeaec..0b3779e5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,4 +3,3 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9da7aac1..244b2acc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with: { clang-format-version: "18" }
 
   test-windows:
-    if: github.event_name == 'merge_group'
+    if: (github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]') || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]')
     runs-on: windows-latest
     steps:
       - uses: actions/cache@v4
@@ -41,7 +41,7 @@ jobs:
         working-directory: test
 
   test-linux:
-    if: github.event_name == 'merge_group'
+    if: (github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]') || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v4
diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc
index 2de0b253..9c8eb869 100644
--- a/bazel/common.bazelrc
+++ b/bazel/common.bazelrc
@@ -1,6 +1,7 @@
 startup --windows_enable_symlinks
 common --enable_bzlmod
 common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main
+common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary
 common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
 common --registry=https://bcr.bazel.build
 build --enable_platform_specific_config
diff --git a/cog.toml b/cog.toml
index c7d273ca..9d9654c1 100644
--- a/cog.toml
+++ b/cog.toml
@@ -1,11 +1,11 @@
 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",
+  # 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 = [
-	"git push",
-	"git push origin {{version}}",
-	"gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
+  "git push",
+  "git push origin {{version}}",
+  "gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
 ]