Repository navigation
Commit 8407be9
authored
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
- .machine_readable/descriptiles
- nqc/web/lib/bs/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | | - | |
17 | 14 | | |
18 | | - | |
19 | | - | |
20 | 15 | | |
21 | 16 | | |
22 | | - | |
23 | 17 | | |
24 | | - | |
25 | | - | |
26 | 18 | | |
27 | | - | |
28 | | - | |
29 | 19 | | |
30 | | - | |
31 | | - | |
32 | 20 | | |
33 | 21 | | |
34 | | - | |
35 | 22 | | |
36 | | - | |
37 | | - | |
38 | 23 | | |
39 | | - | |
40 | | - | |
41 | 24 | | |
42 | | - | |
43 | | - | |
44 | 25 | | |
45 | | - | |
46 | | - | |
47 | 26 | | |
48 | | - | |
49 | | - | |
50 | 27 | | |
51 | | - | |
52 | | - | |
53 | 28 | | |
54 | | - | |
55 | | - | |
56 | 29 | | |
57 | | - | |
58 | | - | |
59 | 30 | | |
60 | | - | |
61 | | - | |
62 | 31 | | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | 32 | | |
67 | | - | |
68 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
21 | | - | |
22 | 20 | | |
23 | 21 | | |
24 | 22 | | |
25 | 23 | | |
26 | | - | |
27 | 24 | | |
28 | 25 | | |
29 | 26 | | |
30 | 27 | | |
31 | 28 | | |
32 | | - | |
33 | 29 | | |
34 | 30 | | |
35 | 31 | | |
36 | 32 | | |
37 | 33 | | |
38 | 34 | | |
39 | | - | |
40 | 35 | | |
41 | 36 | | |
42 | | - | |
43 | 37 | | |
44 | 38 | | |
45 | 39 | | |
| |||
48 | 42 | | |
49 | 43 | | |
50 | 44 | | |
51 | | - | |
52 | 45 | | |
53 | 46 | | |
54 | 47 | | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
18 | 17 | | |
19 | | - | |
20 | 18 | | |
21 | 19 | | |
22 | 20 | | |
23 | 21 | | |
24 | 22 | | |
25 | 23 | | |
26 | | - | |
27 | 24 | | |
28 | 25 | | |
29 | | - | |
30 | 26 | | |
31 | 27 | | |
32 | 28 | | |
33 | 29 | | |
34 | 30 | | |
35 | | - | |
36 | 31 | | |
37 | 32 | | |
38 | 33 | | |
39 | 34 | | |
40 | | - | |
41 | 35 | | |
42 | 36 | | |
43 | 37 | | |
44 | | - | |
45 | 38 | | |
46 | 39 | | |
47 | 40 | | |
48 | 41 | | |
49 | | - | |
50 | 42 | | |
51 | 43 | | |
52 | 44 | | |
53 | 45 | | |
54 | | - | |
55 | 46 | | |
56 | 47 | | |
57 | 48 | | |
58 | | - | |
59 | 49 | | |
60 | 50 | | |
61 | | - | |
62 | 51 | | |
63 | 52 | | |
64 | 53 | | |
65 | 54 | | |
66 | 55 | | |
67 | 56 | | |
68 | | - | |
69 | 57 | | |
70 | 58 | | |
71 | 59 | | |
72 | | - | |
73 | 60 | | |
74 | 61 | | |
75 | 62 | | |
76 | | - | |
77 | 63 | | |
78 | 64 | | |
79 | 65 | | |
80 | 66 | | |
81 | | - | |
82 | 67 | | |
83 | 68 | | |
84 | 69 | | |
85 | 70 | | |
86 | | - | |
87 | 71 | | |
88 | 72 | | |
89 | 73 | | |
90 | 74 | | |
91 | 75 | | |
92 | | - | |
93 | 76 | | |
94 | 77 | | |
95 | 78 | | |
96 | 79 | | |
97 | | - | |
98 | 80 | | |
99 | 81 | | |
100 | 82 | | |
| |||
105 | 87 | | |
106 | 88 | | |
107 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
0 commit comments