From 861be2040d1bf928e40dee91b2b9f4b329140738 Mon Sep 17 00:00:00 2001 From: seaubot Date: Fri, 21 Jun 2024 15:13:23 +0000 Subject: [PATCH] chore: sync with ecsact_common --- .github/workflows/main.yml | 6 +++--- bazel/common.bazelrc | 1 + renovate.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8bd8606..244b2ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,11 +21,11 @@ jobs: steps: - uses: actions/checkout@v4 - uses: greut/eclint-action@v0 - - uses: jidicula/clang-format-action@v4.13.0 + - uses: jidicula/clang-format-action@v4.11.0 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 2de0b25..9c8eb86 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/renovate.json b/renovate.json index 25b1be3..fa1abeb 100644 --- a/renovate.json +++ b/renovate.json @@ -3,4 +3,4 @@ "extends": [ "github>ecsact-dev/renovate-config" ] -} +} \ No newline at end of file