Skip to content

Commit 353d7b3

Browse files
seaubotzaucy
andauthored
chore: sync with ecsact_common (#59)
Co-authored-by: seaubot <seaubot@users.noreply.github.com> Co-authored-by: Ezekiel Warren <ezekiel@seaube.com>
1 parent 5e66d49 commit 353d7b3

File tree

7 files changed

+35
-17
lines changed

7 files changed

+35
-17
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true

.github/workflows/main.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,31 @@
44
name: main
55

66
on:
7-
push:
8-
branches:
9-
- "**"
7+
pull_request:
8+
merge_group:
109

1110
jobs:
11+
typos-check:
12+
name: Typos Check
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: crate-ci/typos@v1.19.0
17+
1218
formatting-check:
1319
name: Formatting Check
1420
runs-on: ubuntu-latest
1521
steps:
1622
- uses: actions/checkout@v4
17-
- uses: jidicula/clang-format-action@v4.9.0
18-
with: { clang-format-version: "16" }
23+
- uses: greut/eclint-action@v0
24+
- uses: jidicula/clang-format-action@v4.11.0
25+
with: { clang-format-version: "18" }
1926

2027
test-windows:
28+
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]')
2129
runs-on: windows-latest
2230
steps:
23-
- uses: actions/cache@v3
31+
- uses: actions/cache@v4
2432
with:
2533
path: |
2634
/Users/runneradmin/AppData/Local/bazelisk
@@ -33,9 +41,10 @@ jobs:
3341
working-directory: test
3442

3543
test-linux:
44+
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]')
3645
runs-on: ubuntu-latest
3746
steps:
38-
- uses: actions/cache@v3
47+
- uses: actions/cache@v4
3948
with:
4049
path: |
4150
~/.cache/bazelisk

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ All notable changes to this project will be documented in this file. See [conven
104104

105105
- - -
106106

107-
Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
107+
Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).

bazel/common.bazelrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
startup --windows_enable_symlinks
22
common --enable_bzlmod
33
common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main
4+
common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary
45
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
56
common --registry=https://bcr.bazel.build
67
build --enable_platform_specific_config
@@ -10,9 +11,6 @@ build --enable_runfiles
1011
build --noincompatible_remove_rule_name_parameter
1112
query --noincompatible_remove_rule_name_parameter
1213

13-
# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
14-
build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
15-
1614
common:ci --announce_rc
1715
common:ci --verbose_failures
1816
common:ci --keep_going

cog.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
pre_bump_hooks = [
2-
# Ecsact pre 1.0.0 the 0.X.0 is our 'major' version
3-
"buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module",
2+
# Ecsact pre 1.0.0 the 0.X.0 is our 'major' version
3+
"buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module",
4+
"bazel mod tidy",
45
]
56

67
post_bump_hooks = [
7-
"git push",
8-
"git push origin {{version}}",
9-
"gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
8+
"git push",
9+
"git push origin {{version}}",
10+
"gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
1011
]

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"extends": [
44
"github>ecsact-dev/renovate-config"
55
]
6-
}
6+
}

typos.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[files]
2+
extend-exclude = ["CHANGELOG.md"]
3+
4+
[default]
5+
extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]

0 commit comments

Comments
 (0)