Skip to content

Commit 9ca0909

Browse files
hyperpolymathmistral-vibeClaude
authored
reconcile: estate-standardization-20260607 onto main (preserve #34/#38 fixes) (#40)
## What Reconciles the maintainer's **`estate-standardization-20260607`** branch (the estate-standards catch-up) onto **current `main`**, resolving its divergence + conflicts with the merged #34/#38 work — so `main` can adopt the standardization without regressing recent fixes. Brings onto main: the `svc/k9 → self-validating/` rename, `bot_directives`, the contractiles refresh, governance docs, and flake updates. ## Conflict resolutions (7 files) | File(s) | Resolution | Why | |---|---|---| | `dependabot-automerge.yml`, `dogfood-gate.yml`, `static-analysis-gate.yml`, `hypatia-scan.yml` | **take main** | main's workflow layer has moved past the 6-day-old standardization (TruffleHog, CodeQL `actions` extractor, hypatia-scan removal). `hypatia-scan.yml` stays deleted — consistent with dropping the superseded `hypatia-scan-reusable-wrapper` branch. | | `contractiles/Justfile` (add/add) | take main | near-identical; main is current. | | `bust/Bustfile.a2ml`, `dust/Dustfile.a2ml` (modify/delete) | **keep main's** | live, valued contractiles — not dropped. | **Preserved from #34/#38** (auto-merged correctly): my **K9! magic + pedigree** fixes carried through the `svc/k9 → self-validating` rename; the **`ci.yml` grammar-guard `^data_` anchor**; the nightly-toolchain `test` job. ## Verification On the reconciled tree, run with the upstream actions: - **`k9-validate-action` → 0 errors** - **`a2ml-validate-action` → 0 errors** The standardization touches **no Rust** (only `.machine_readable` / workflows / flake / docs), so the code is main's, unchanged. ## Notes - Draft — this reconciles a **maintainer-owned** standardization, so it wants maintainer review. Once merged, the old `estate-standardization-20260607` and the superseded `chore/hypatia-scan-reusable-wrapper` branches can be deleted. - CI is currently **billing-blocked** (jobs fail in 2–3s with no logs), so this won't get a CI run until that's restored. --- _Generated by [Claude Code](https://claude.ai/code/session_018CaSgNjNURC7ocsyjYh9We)_ --------- Co-authored-by: Mistral Vibe <vibe@mistral.ai> Co-authored-by: Claude <paraordinate@yahoo.co.uk>
1 parent 95dbc45 commit 9ca0909

30 files changed

Lines changed: 28 additions & 0 deletions

.github/workflows/boj-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
jobs:
1515
trigger-boj:
1616
runs-on: ubuntu-latest
17+
timeout-minutes: 15
1718
if: ${{ vars.BOJ_SERVER_URL != '' || secrets.BOJ_SERVER_URL != '' }}
1819
steps:
1920
- name: Checkout

.github/workflows/casket-pages.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ concurrency:
1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
17+
timeout-minutes: 15
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -96,6 +97,7 @@ jobs:
9697
name: github-pages
9798
url: ${{ steps.deployment.outputs.page_url }}
9899
runs-on: ubuntu-latest
100+
timeout-minutes: 15
99101
needs: build
100102
steps:
101103
- name: Deploy to GitHub Pages

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313
jobs:
1414
test:
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 15
1617
steps:
1718
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1819
- uses: dtolnay/rust-toolchain@4be9e76fd7c4901c61fb841f559994984270fce7
@@ -30,6 +31,7 @@ jobs:
3031
run: cargo fmt -- --check
3132
grammar-guard:
3233
runs-on: ubuntu-latest
34+
timeout-minutes: 15
3335
steps:
3436
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3537
- name: Grammar change detection

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ permissions:
1919
jobs:
2020
analyze:
2121
runs-on: ubuntu-latest
22+
timeout-minutes: 15
2223
permissions:
2324
contents: read
2425
security-events: write

.github/workflows/guix-nix-policy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66
jobs:
77
check:
88
runs-on: ubuntu-latest
9+
timeout-minutes: 15
910
permissions:
1011
contents: read
1112
steps:

.github/workflows/k9-svc-validation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66
jobs:
77
validate:
88
runs-on: ubuntu-latest
9+
timeout-minutes: 15
910
steps:
1011
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1112
- name: Validate contractiles

.github/workflows/npm-bun-blocker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66
jobs:
77
check:
88
runs-on: ubuntu-latest
9+
timeout-minutes: 15
910
permissions:
1011
contents: read
1112
steps:

.github/workflows/openssf-compliance.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313
jobs:
1414
openssf-compliance:
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 15
1617
permissions:
1718
contents: read
1819
steps:

.github/workflows/quality.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66
jobs:
77
lint:
88
runs-on: ubuntu-latest
9+
timeout-minutes: 15
910
permissions:
1011
contents: read
1112
steps:
@@ -32,6 +33,7 @@ jobs:
3233
continue-on-error: true
3334
docs:
3435
runs-on: ubuntu-latest
36+
timeout-minutes: 15
3537
permissions:
3638
contents: read
3739
steps:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
build:
1616
name: Build Artifacts
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 15
1819
permissions:
1920
contents: read
2021
steps:
@@ -72,6 +73,7 @@ jobs:
7273
changelog:
7374
name: Generate Changelog
7475
runs-on: ubuntu-latest
76+
timeout-minutes: 15
7577
permissions:
7678
contents: read
7779
outputs:
@@ -112,6 +114,7 @@ jobs:
112114
name: Create GitHub Release
113115
needs: [build, changelog]
114116
runs-on: ubuntu-latest
117+
timeout-minutes: 15
115118
permissions:
116119
contents: write
117120
steps:

0 commit comments

Comments
 (0)