Skip to content

Commit 8407be9

Browse files
resolve: conflicts for #90 (chore/apply-foundation-ci-fixes-20260911) (#94)
Supersedes #90 (chore/apply-foundation-ci-fixes-20260911), which is unmergeable as it stands. ## What this is One linear commit on top of current `main` containing exactly the net effect of merging `main` into `chore/apply-foundation-ci-fixes-20260911` with every conflict resolved. Linear and single-commit because the branch rules require linear history and allow squash merges only. Original PR: #90 ## Conflicts and how each was resolved | Path | Conflict | Resolution | |---|---|---| | `.github/workflows/codeql.yml` | content | NEEDS_HUMAN | | `.github/workflows/governance.yml` | content | NEEDS_HUMAN | | `.github/workflows/hypatia-scan.yml` | content | NEEDS_HUMAN | | `.github/workflows/scorecard.yml` | content | NEEDS_HUMAN | | `0-AI-MANIFEST.a2ml` | content | NEEDS_HUMAN | | `EXPLAINME.adoc` | content | NEEDS_HUMAN | | `README.adoc` | content | NEEDS_HUMAN | | `TOPOLOGY.md` | modify/delete: deleted in main, modified in PR | TAKE_PR | ### Why `guix.scm` is kept, not deleted The PR carries `fix(ci): remove erroneous squisher-corpus guix.scm placeholder`. That was correct when the branch was cut — the merge-base file was a template with unexpanded `{{PROJECT_NAME}}` tokens. **`main` has since replaced it with a real package definition** (name, version, `coreutils bash` inputs; `grep -c '{{'` now returns 0). Honouring the deletion would destroy a working file, so main's version is kept. ### Why the workflow pins stay at main's The PR branch pins older `hyperpolymath/standards` revisions than `main`: | Pin | Date | Position | |---|---|---| | `d7c22711` | 2026-06-26 | PR side | | `81dbf2dd` | 2026-07-21 | main side | | `d135b05b` | 2026-06-24 | PR side | | `c65436ee` | 2026-07-20 | main side | Taking the PR side would downgrade the reusable workflows by about a month. Most of these files conflicted only because `main` added a trailing newline on the same last line the PR re-pinned. ## Verification Asserted before push, then re-confirmed by an independent `git ls-remote`: - exactly 1 commit ahead of `main`, 0 behind - no conflict markers anywhere in the tree - `git merge-tree` against `main` exits 0 — genuinely conflict-free - no `standards` pin in the tree that is unreachable from `standards/main` - `guix.scm` present wherever `main` has it Remote SHA: `71b6d33c854e` ## Net effect on `main` ``` .editorconfig | 39 +++-------------------------- .gitattributes | 11 +++----- .gitignore | 35 +++++++++++++------------- .machine_readable/descriptiles/AGENTIC.a2ml | 2 +- .nojekyll | 0 nqc/web/lib/bs/src/Msg.d | 0 nqc/web/lib/bs/src/Route.d | 0 7 files changed, 25 insertions(+), 62 deletions(-) ```
1 parent 8d07120 commit 8407be9

7 files changed

Lines changed: 25 additions & 62 deletions

File tree

‎.editorconfig‎

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,34 @@
22
# https://editorconfig.org
33

44
root = true
5-
65
[*]
76
charset = utf-8
87
end_of_line = lf
98
indent_size = 2
109
indent_style = space
1110
insert_final_newline = true
1211
trim_trailing_whitespace = true
13-
1412
[*.md]
1513
trim_trailing_whitespace = false
16-
1714
[*.adoc]
18-
trim_trailing_whitespace = false
19-
2015
[*.rs]
2116
indent_size = 4
22-
2317
[*.ex]
24-
indent_size = 2
25-
2618
[*.exs]
27-
indent_size = 2
28-
2919
[*.zig]
30-
indent_size = 4
31-
3220
[*.ada]
3321
indent_size = 3
34-
3522
[*.adb]
36-
indent_size = 3
37-
3823
[*.ads]
39-
indent_size = 3
40-
4124
[*.hs]
42-
indent_size = 2
43-
4425
[*.res]
45-
indent_size = 2
46-
4726
[*.resi]
48-
indent_size = 2
49-
5027
[*.ncl]
51-
indent_size = 2
52-
5328
[*.rkt]
54-
indent_size = 2
55-
5629
[*.scm]
57-
indent_size = 2
58-
5930
[*.nix]
60-
indent_size = 2
61-
6231
[Justfile]
63-
indent_style = space
64-
indent_size = 4
65-
6632
[justfile]
67-
indent_style = space
68-
indent_size = 4
33+
# SPDX-License-Identifier: MPL-2.0
34+
[Makefile]
35+
indent_style = tab

‎.gitattributes‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# RSR-compliant .gitattributes
33

44
* text=auto eol=lf
5-
65
# Source
76
*.rs text eol=lf diff=rust
87
*.ex text eol=lf diff=elixir
@@ -18,28 +17,23 @@
1817
*.scm text eol=lf
1918
*.ncl text eol=lf
2019
*.nix text eol=lf
21-
2220
# Docs
2321
*.md text eol=lf diff=markdown
2422
*.adoc text eol=lf
2523
*.txt text eol=lf
26-
2724
# Data
2825
*.json text eol=lf
2926
*.yaml text eol=lf
3027
*.yml text eol=lf
3128
*.toml text eol=lf
32-
3329
# Config
3430
.gitignore text eol=lf
3531
.gitattributes text eol=lf
3632
justfile text eol=lf
3733
Makefile text eol=lf
3834
Containerfile text eol=lf
39-
4035
# Scripts
4136
*.sh text eol=lf
42-
4337
# Binary
4438
*.png binary
4539
*.jpg binary
@@ -48,7 +42,10 @@ Containerfile text eol=lf
4842
*.woff2 binary
4943
*.zip binary
5044
*.gz binary
51-
5245
# Lock files
5346
Cargo.lock text eol=lf -diff
5447
flake.lock text eol=lf -diff
48+
*.a2ml text eol=lf linguist-language=TOML
49+
*.zig text eol=lf
50+
.editorconfig text eol=lf
51+
.tool-versions text eol=lf

‎.gitignore‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,92 +9,74 @@ Thumbs.db
99
*~
1010
.idea/
1111
.vscode/
12-
1312
# Build
1413
/target/
1514
/_build/
1615
/build/
1716
/dist/
1817
/out/
19-
2018
# Dependencies
2119
/node_modules/
2220
**/node_modules/
2321
/vendor/
2422
/deps/
2523
/.elixir_ls/
26-
2724
# Rust
2825
# Cargo.lock # Keep for binaries
29-
3026
# Elixir
3127
/cover/
3228
/doc/
3329
*.ez
3430
erl_crash.dump
35-
3631
# Julia
3732
*.jl.cov
3833
*.jl.mem
3934
/Manifest.toml
40-
4135
# ReScript
4236
/lib/bs/
4337
/.bsb.lock
44-
4538
# Python (SaltStack only)
4639
__pycache__/
4740
*.py[cod]
4841
.venv/
49-
5042
# Ada/SPARK
5143
*.ali
5244
/obj/
5345
/bin/
54-
5546
# Haskell
5647
/.stack-work/
5748
/dist-newstyle/
58-
5949
# Chapel
6050
*.chpl.tmp.*
61-
6251
# Secrets
6352
.env
6453
.env.*
6554
*.pem
6655
*.key
6756
secrets/
68-
6957
# Test/Coverage
7058
/coverage/
7159
htmlcov/
72-
7360
# Logs
7461
*.log
7562
/logs/
76-
7763
# Temp
7864
/tmp/
7965
*.tmp
8066
*.bak
81-
8267
# Crash recovery artifacts
8368
ai-cli-crash-capture/
8469
sync_report*.txt
8570
.directory
86-
8771
# VeriSimDB app data — belongs in standalone verisimdb-data repo, NOT here.
8872
# See: https://github.com/hyperpolymath/verisimdb-data
8973
# LLMs: DO NOT store application data in the VeriSimDB source tree.
9074
# Each project gets its own VeriSimDB instance + port + volume.
9175
verisimdb/verisimdb-data/
92-
9376
# ReScript/OCaml compiler artifacts
9477
*.cmt
9578
*.cmti
9679
*.cmi
97-
9880
# asdf version manager
9981
.tool-versions
10082
target/
@@ -105,3 +87,20 @@ deps/
10587
.cache/
10688
build/
10789
dist/
90+
# Build (unanchored to match nested monorepo paths)
91+
zig-out/
92+
zig-cache/
93+
.zig-cache/
94+
# Machine-readable locks
95+
.machine_readable/.locks/
96+
# Rust build artefacts (innervation tools)
97+
inline-annotations/extractor/target/
98+
k9-coordination-protocol/tools/k9-init/target/
99+
hooks/playbook-to-recipe/target/
100+
inline-annotations/extractor/Cargo.lock
101+
k9-coordination-protocol/tools/k9-init/Cargo.lock
102+
hooks/playbook-to-recipe/Cargo.lock
103+
.verisimdb/ecosystem-ingest/target/
104+
.verisimdb/ecosystem-ingest/Cargo.lock
105+
# Backup/scratch files (never commit)
106+
*.backup

‎.machine_readable/descriptiles/AGENTIC.a2ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ can-create-files = true
2323
# - Never place state files in repository root (must be in .machine_readable/)
2424
# - Never use AGPL license (use PMPL-1.0-or-later)
2525
# - Never add per-database implementation content (source, schemas, migrations,
26-
# per-database docs, query-language implementations) to this COORDINATION repo;
26+
# per-database docs, database-language implementations) to this COORDINATION repo;
2727
# it belongs in that database's own repo (see REGISTRY.adoc)

‎.nojekyll‎

Whitespace-only changes.

‎nqc/web/lib/bs/src/Msg.d‎

Whitespace-only changes.

‎nqc/web/lib/bs/src/Route.d‎

Whitespace-only changes.

0 commit comments

Comments
 (0)