Skip to content

Commit 5a04e42

Browse files
committed
Merge branch 'main' into fix/issue-1718-approve-sensitive-separators
main landed the same separator-equivalent comparison in 2e6dc08 (ws_prefix_equal), so the conflict in ws_is_ancestor_or_equal resolves to main's helper; the DeusData#1718 comment above the function is kept. The two test-file conflicts were both sides adding tests at the same place, and keep both. Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
2 parents 8553224 + 4c80d89 commit 5a04e42

2,048 files changed

Lines changed: 3722860 additions & 1183830 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codebase-memory.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"test_impact": {
3+
"version": 1,
4+
"tests": {
5+
"presets": {
6+
"c-cbm": true
7+
}
8+
},
9+
"rules": [
10+
{
11+
"id": "harness",
12+
"paths": ["tests/test_framework.h", "tests/test_helpers.*", "tests/test_main.c"],
13+
"action": "run_all"
14+
},
15+
{
16+
"id": "engine",
17+
"paths": [
18+
".codebase-memory.json",
19+
"src/mcp/test_impact*",
20+
"src/store/store_impact.*",
21+
"scripts/test-impact/**",
22+
"scripts/ci/test-impact-*"
23+
],
24+
"action": "run_all"
25+
},
26+
{
27+
"id": "build",
28+
"paths": [
29+
"scripts/build.sh",
30+
"scripts/env.sh",
31+
"scripts/test.sh",
32+
"scripts/run-tests-parallel.sh",
33+
"scripts/run-test-wave.py",
34+
"scripts/path-safety.sh",
35+
"scripts/clean.sh",
36+
"scripts/suite-failure-report.sh",
37+
"scripts/ci/verify-shard-union.sh",
38+
"scripts/embed-frontend.sh",
39+
"/.gitattributes"
40+
],
41+
"action": "run_all"
42+
},
43+
{
44+
"id": "grammars",
45+
"paths": ["internal/cbm/vendored/**"],
46+
"action": "run_all"
47+
},
48+
{
49+
"id": "fixtures",
50+
"paths": ["tests/fixtures/*/**"],
51+
"action": "referencing_tests",
52+
"key": "path_segment:2"
53+
},
54+
{
55+
"id": "contracts",
56+
"paths": ["tests/**/*.{sh,py,json,txt,ps1}"],
57+
"action": "ignore"
58+
},
59+
{
60+
"id": "notices",
61+
"paths": ["NOTICE*", "CHANGELOG*", "THIRD_PARTY*"],
62+
"action": "ignore"
63+
},
64+
{
65+
"id": "repo-data",
66+
"paths": [
67+
"scripts/**",
68+
"pkg/**",
69+
"test-infrastructure/**",
70+
"docs/**",
71+
"**/*.md",
72+
"graph-ui/**",
73+
"tools/**",
74+
"tests/fuzz/corpus/**",
75+
"/{.clang-format,.clang-tidy,.cppcheck,.gitignore,.gitleaksignore,DCO,Formula}",
76+
"/{flake.lock,flake.nix,glama.json,install.ps1,install.sh,server.json}"
77+
],
78+
"action": "referencing_tests",
79+
"key": "path",
80+
"unreferenced": "ignore"
81+
}
82+
],
83+
"unmapped_files": "run_all",
84+
"coverage": {
85+
"compatibility_paths": [
86+
"tests/test_framework.h",
87+
"tests/test_main.c",
88+
"tests/test_helpers.h",
89+
"Makefile.cbm",
90+
"scripts/test-impact/coverage-map.py",
91+
"scripts/test-impact/coverage-merge.py"
92+
]
93+
}
94+
}
95+
}

‎.gitattributes‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,14 @@ internal/cbm/vendored/grammars/**/scanner.c linguist-generated=true diff=false
1111
# the git hooks are extensionless and need explicit entries. (#1272)
1212
scripts/git-hooks/commit-msg text eol=lf
1313
scripts/hooks/pre-commit text eol=lf
14+
15+
# Chialisp grammar corpus: one case asserts CRLF comment termination, so this
16+
# file must keep its exact bytes on every platform (no eol conversion). (#919)
17+
tools/tree-sitter-chialisp/test/corpus/comments.txt -text
18+
19+
# llvm-profdata text captures: tests/test_profile_text_parser.py checks their
20+
# SHA-256, so they keep their exact bytes on every platform (no eol conversion).
21+
tests/fixtures/profile_text/*.proftext -text
22+
# Golden profile-map outputs: tests/test_profile_map_v2.py compares the
23+
# producer's LF bytes against them, so they keep their exact bytes too.
24+
tests/fixtures/profile_map_v2/*.tsv -text

‎.github/scancode-constraints.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Constraints for the ScanCode install of the license gate (PIP_CONSTRAINT).
2+
# pluggy 1.7.0 (2026-10-15) no longer finds plugincode 32.0.0's class-level
3+
# hookspecs: scancode then crashes at import with "did not find any
4+
# 'pre_scan' hooks" and the gate fails on every run.
5+
pluggy==1.6.0

‎.github/workflows/_build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Attest release candidate provenance
9999
if: ${{ inputs.attest }}
100-
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
100+
uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
101101
with:
102102
subject-path: |
103103
release-candidates/${{ matrix.goos }}-${{ matrix.goarch }}/candidate-provenance.tsv
@@ -155,7 +155,7 @@ jobs:
155155
156156
- name: Attest release candidate provenance
157157
if: ${{ inputs.attest }}
158-
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
158+
uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
159159
with:
160160
subject-path: |
161161
release-candidates/windows-amd64/candidate-provenance.tsv
@@ -217,7 +217,7 @@ jobs:
217217
218218
- name: Attest release candidate provenance
219219
if: ${{ inputs.attest }}
220-
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
220+
uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
221221
with:
222222
subject-path: |
223223
release-candidates/windows-arm64/candidate-provenance.tsv
@@ -280,7 +280,7 @@ jobs:
280280
281281
- name: Attest release candidate provenance
282282
if: ${{ inputs.attest }}
283-
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
283+
uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
284284
with:
285285
subject-path: |
286286
release-candidates/linux-${{ matrix.arch }}-portable/candidate-provenance.tsv
@@ -432,7 +432,7 @@ jobs:
432432
433433
- name: Attest selected containers and decision evidence
434434
if: ${{ inputs.attest }}
435-
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
435+
uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
436436
with:
437437
subject-path: |
438438
release-containers/**/*.tar.gz

‎.github/workflows/_lint.yml‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,31 @@
33
name: Lint & Security
44

55
on:
6-
workflow_call: {}
6+
workflow_call:
7+
inputs:
8+
lanes:
9+
description: 'PR lane selection (scripts/ci/select-lanes.sh JSON list); "all" = every job (dry run, release)'
10+
type: string
11+
default: all
712

813
permissions:
914
contents: read
1015

1116
jobs:
1217
lint:
13-
runs-on: ubuntu-latest
18+
if: ${{ inputs.lanes == 'all' || contains(fromJSON(inputs.lanes), 'lint') }}
19+
# Pinned, not ubuntu-latest: the LLVM install below adds an
20+
# apt.llvm.org llvm-toolchain-NOBLE repo, which is 24.04 by name. When
21+
# GitHub moves ubuntu-latest to the next LTS this job breaks on a day
22+
# nobody chose. Pin the runner to the release the repo line already names.
23+
runs-on: ubuntu-24.04
1424
# 15 min proved too tight on a slow runner day and a timed-out lint reads
1525
# as "cancelled", which the release graph must treat as a hard stop; keep
16-
# a bound, but one only a genuine hang can hit (normal runtime ~5 min).
17-
timeout-minutes: 30
26+
# a bound, but one only a genuine hang can hit. 30 min stopped being that
27+
# in 2026-10: single-process cppcheck over a src tree that grew ~60 % in
28+
# files took the lint step from ~8 to 22-29 min, and three runs on
29+
# 2026-10-13 were cancelled at 30 min with cppcheck still alive.
30+
timeout-minutes: 45
1831
steps:
1932
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2033

@@ -60,20 +73,22 @@ jobs:
6073
# provability (never suppressed — the NOLINT ban applies here too).
6174
# Vendored-tree diagnostics are path-filtered, mirroring .cppcheck.
6275
lint-mem:
63-
runs-on: ubuntu-latest
76+
if: ${{ inputs.lanes == 'all' || contains(fromJSON(inputs.lanes), 'lint-mem') }}
77+
# Pinned for the same reason as `lint`: llvm-toolchain-noble-21 below.
78+
runs-on: ubuntu-24.04
6479
timeout-minutes: 60
6580
steps:
6681
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6782

6883
- name: Install build deps
6984
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev
7085

71-
- name: Install LLVM 22 (pinned analyzer toolchain)
86+
- name: Install LLVM 21 (pinned analyzer toolchain)
7287
run: |
7388
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
74-
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" | sudo tee /etc/apt/sources.list.d/llvm-22.list
89+
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main" | sudo tee /etc/apt/sources.list.d/llvm-21.list
7590
sudo apt-get update
76-
sudo apt-get install -y clang-tidy-22
91+
sudo apt-get install -y clang-tidy-21
7792
7893
- name: Memory-analyzer gate
79-
run: scripts/ci/lint-mem.sh clang-tidy-22
94+
run: scripts/ci/lint-mem.sh clang-tidy-21

0 commit comments

Comments
 (0)