Skip to content

Commit 2e93b5a

Browse files
committed
chore: sync with ecsact_common
1 parent d098c2d commit 2e93b5a

File tree

7 files changed

+74
-22
lines changed

7 files changed

+74
-22
lines changed

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.3.2

.github/workflows/bzlmod-archive.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is maintained by ecsact-dev/ecsact_common
2+
# If changes are required please make them there
3+
4+
name: bzlmod archive
5+
6+
on:
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
bzlmod-archive:
12+
uses: ecsact-dev/bazel_registry/.github/workflows/bzlmod-archive.yml@main
13+
secrets: inherit
14+
permissions:
15+
contents: write

.github/workflows/main.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
name: CI
1+
# This file is maintained by ecsact-dev/ecsact_common
2+
# If changes are required please make them there
3+
4+
name: main
25

36
on:
47
push:
58
branches:
69
- "**"
710

8-
concurrency:
9-
group: ${{ github.ref }}
10-
cancel-in-progress: true
11-
1211
jobs:
1312
formatting-check:
1413
name: Formatting Check
1514
runs-on: ubuntu-latest
1615
steps:
17-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1817
- uses: jidicula/[email protected]
19-
with: { clang-format-version: "15" }
18+
with: { clang-format-version: "16" }
2019

2120
test-windows:
2221
runs-on: windows-latest
@@ -27,9 +26,10 @@ jobs:
2726
/Users/runneradmin/AppData/Local/bazelisk
2827
/Users/runneradmin/.cache/bazel-disk-cache
2928
key: ${{runner.os}}-bazel-cache
30-
- uses: actions/checkout@v3
31-
- run: bazel test --config=ci //...
32-
- run: bazel build --config=ci //...
29+
- uses: actions/checkout@v4
30+
- run: bazelisk build --config=ci //...
31+
- if: ${{ hashfiles('test/MODULE.bazel') != '' }}
32+
run: bazelisk test --config=ci ...
3333
working-directory: test
3434

3535
test-linux:
@@ -41,7 +41,8 @@ jobs:
4141
~/.cache/bazelisk
4242
~/.cache/bazel-disk-cache
4343
key: ${{runner.os}}-bazel-cache
44-
- uses: actions/checkout@v3
45-
- run: bazel test --config=ci //...
46-
- run: bazel build --config=ci //...
44+
- uses: actions/checkout@v4
45+
- run: bazelisk build --config=ci //...
46+
- if: ${{ hashfiles('test/MODULE.bazel') != '' }}
47+
run: bazelisk test --config=ci ...
4748
working-directory: test

bazel/common.bazelrc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
startup --windows_enable_symlinks
2+
common --enable_bzlmod
3+
common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main
4+
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
5+
common --registry=https://bcr.bazel.build
6+
build --enable_platform_specific_config
7+
build --incompatible_use_platforms_repo_for_constraints
8+
build --incompatible_enable_cc_toolchain_resolution
9+
build --incompatible_strict_action_env
10+
build --enable_runfiles
11+
build --noincompatible_remove_rule_name_parameter
12+
query --noincompatible_remove_rule_name_parameter
13+
14+
# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
15+
build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
16+
17+
common:ci --announce_rc
18+
common:ci --verbose_failures
19+
common:ci --keep_going
20+
common:ci --disk_cache=~/.cache/bazel-disk-cache

bazel/copts.bzl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
copts = select({
2-
"@bazel_tools//tools/cpp:msvc": ["/std:c++latest", "/Zc:preprocessor", "/permissive-"],
3-
"//conditions:default": ["-std=c++20"],
1+
load("@bazel_skylib//lib:selects.bzl", "selects")
2+
3+
# Ecsact repositories currently only support clang and cl
4+
copts = selects.with_or({
5+
("@rules_cc//cc/compiler:clang"): [
6+
"-std=c++2b",
7+
"-fexperimental-library",
8+
],
9+
("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [
10+
"/std:c++latest",
11+
"/permissive-",
12+
"/Zc:preprocessor",
13+
],
414
})

cog.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
post_bump_hooks = [
2-
"git push",
3-
"git push origin {{version}}",
4-
"gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
5-
]
1+
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",
4+
]
5+
6+
post_bump_hooks = [
7+
"git push",
8+
"git push origin {{version}}",
9+
"gh release create {{version}} --generate-notes --latest -t {{version}} --verify-tag",
10+
]

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+
}

0 commit comments

Comments
 (0)