Skip to content

Commit 2e8cb15

Browse files
seaubotzaucy
authored andcommitted
chore: sync with ecsact_common
1 parent 8ec3473 commit 2e8cb15

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,44 @@
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/[email protected]
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: jidicula/clang-format-action@v4.11.0
24+
with: { clang-format-version: "18" }
1925

2026
test-windows:
2127
runs-on: windows-latest
2228
steps:
23-
- name: Ecsact SDK
24-
uses: ecsact-dev/[email protected]
25-
- uses: actions/cache@v3
29+
- uses: actions/cache@v4
2630
with:
2731
path: |
2832
/Users/runneradmin/AppData/Local/bazelisk
2933
/Users/runneradmin/.cache/bazel-disk-cache
3034
key: ${{runner.os}}-bazel-cache
3135
- uses: actions/checkout@v4
32-
- run: bazelisk --output_user_root=C:/tmp build --config=ci //...
36+
- run: bazelisk build --config=ci //...
3337
- if: ${{ hashfiles('test/MODULE.bazel') != '' }}
34-
run: bazelisk --output_user_root=C:/tmp test --config=ci ...
38+
run: bazelisk test --config=ci ...
3539
working-directory: test
3640

3741
test-linux:
3842
runs-on: ubuntu-latest
3943
steps:
40-
- name: Ecsact SDK
41-
uses: ecsact-dev/[email protected]
42-
- uses: actions/cache@v3
44+
- uses: actions/cache@v4
4345
with:
4446
path: |
4547
~/.cache/bazelisk

bazel/common.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ build --enable_runfiles
1010
build --noincompatible_remove_rule_name_parameter
1111
query --noincompatible_remove_rule_name_parameter
1212

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-
1613
common:ci --announce_rc
1714
common:ci --verbose_failures
1815
common:ci --keep_going

bazel/copts.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ copts = selects.with_or({
1010
"-fexperimental-library",
1111
],
1212
("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [
13-
"/std:c++latest",
13+
"/std:c++20",
1414
"/permissive-",
1515
"/Zc:preprocessor",
1616
],

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)