From 2e0249f651e42ede0800b0622f799c582023d45a Mon Sep 17 00:00:00 2001 From: seaubot Date: Wed, 15 May 2024 17:15:03 +0000 Subject: [PATCH] chore: sync with ecsact_common --- .github/workflows/main.yml | 4 +++- bazel/common.bazelrc | 4 ---- cog.toml | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25461d8..159ff05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: crate-ci/typos@v1.20.4 + - uses: crate-ci/typos@v1.19.0 formatting-check: name: Formatting Check @@ -24,6 +24,7 @@ jobs: with: { clang-format-version: "18" } test-windows: + if: github.event_name == 'merge_group' runs-on: windows-latest steps: - uses: actions/cache@v4 @@ -39,6 +40,7 @@ jobs: working-directory: test test-linux: + if: github.event_name == 'merge_group' runs-on: ubuntu-latest steps: - uses: actions/cache@v4 diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index f7f1a37..2de0b25 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -2,9 +2,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/bazelboost/registry/main -common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary common --registry=https://bcr.bazel.build - build --enable_platform_specific_config build --incompatible_enable_cc_toolchain_resolution build --incompatible_strict_action_env @@ -16,5 +14,3 @@ common:ci --announce_rc common:ci --verbose_failures common:ci --keep_going common:ci --disk_cache=~/.cache/bazel-disk-cache -test:ci --test_output=errors - diff --git a/cog.toml b/cog.toml index 9cbba6c..c7d273c 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 = [