chore: sync with ecsact_common

ecsact-dev · Jun 21, 2024 · f7e5f19 · f7e5f19
1 parent 2677d39
commit f7e5f19
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.1.2
+7.2.0
diff --git 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
@@ -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/renovate.json b/renovate.json
@@ -3,4 +3,4 @@
 	"extends": [
 		"github>ecsact-dev/renovate-config"
 	]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
     	"extends": [
     		"github>ecsact-dev/renovate-config"
     	]
-    }
+    }