Skip to content

Commit

Permalink
chore: sync with ecsact_common (#230)
Browse files Browse the repository at this point in the history
Co-authored-by: seaubot <[email protected]>
  • Loading branch information
seaubot and seaubot authored Jun 21, 2024
1 parent 8ad28c4 commit e7069dd
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.2
7.2.0
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ root = true
[*]
end_of_line = lf
insert_final_newline = true

4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions bazel/common.bazelrc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions cog.toml
Original file line number Diff line number Diff line change
@@ -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",
]

0 comments on commit e7069dd

Please sign in to comment.