From 4e66b47acb604761eef3c0e9971615e10f44ec3f Mon Sep 17 00:00:00 2001 From: seaubot Date: Fri, 21 Jun 2024 15:14:25 +0000 Subject: [PATCH] chore: sync with ecsact_common --- .bazelversion | 2 +- .editorconfig | 5 +++++ .github/workflows/main.yml | 3 +++ bazel/common.bazelrc | 1 + cog.toml | 11 ++++++----- renovate.json | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 .editorconfig diff --git a/.bazelversion b/.bazelversion index 21c8c7b..0ee843c 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.1.1 +7.2.0 diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0b3779e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c1af85..244b2ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,10 +20,12 @@ 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 == '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 @@ -39,6 +41,7 @@ jobs: working-directory: test test-linux: + 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/cog.toml b/cog.toml index 9cbba6c..9d9654c 100644 --- a/cog.toml +++ b/cog.toml @@ -1,10 +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", + # 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", ] diff --git a/renovate.json b/renovate.json index fa1abeb..25b1be3 100644 --- a/renovate.json +++ b/renovate.json @@ -3,4 +3,4 @@ "extends": [ "github>ecsact-dev/renovate-config" ] -} \ No newline at end of file +}