From f8da86578e0931bf8479ec7bbb8da9a3465edc9d Mon Sep 17 00:00:00 2001 From: "Jonathan D.A. Jewell" <6759885+hyperpolymath@users.noreply.github.com> Date: Sat, 19 Sep 2026 09:09:05 +0000 Subject: [PATCH] refactor(root): move root artefacts to their canonical locations Applies the estate root-shape rollout: files that are not root-level by necessity move to where their tooling and the estate canon expect them, and every reference to them is updated in the same change. * .github/hooks/validate-a2ml.sh (from .githooks/validate-a2ml.sh) -> .github/hooks/validate-a2ml.sh * .github/hooks/validate-k9.sh (from .githooks/validate-k9.sh) -> .github/hooks/validate-k9.sh * .github/workflows/dogfood-gate.yml * .machine_readable/contractiles/Justfile * Justfile * RSR_OUTLINE.adoc * build/guix.scm (from guix.scm) -> build/guix.scm * docs/CICD_HYPER_A_INTEGRATION.adoc * docs/DIRECTORY_STRUCTURE.adoc * docs/VSH_IMPROVEMENTS.adoc * scripts/generate-badges.sh Verified with `git apply --check` against current main before committing; no behaviour change intended, the Justfile entry points keep working. --- {.githooks => .github/hooks}/validate-a2ml.sh | 0 {.githooks => .github/hooks}/validate-k9.sh | 0 .github/workflows/dogfood-gate.yml | 4 +-- .machine_readable/contractiles/Justfile | 8 +++--- Justfile | 8 +++--- RSR_OUTLINE.adoc | 2 +- docs/CICD_HYPER_A_INTEGRATION.adoc | 2 +- docs/DIRECTORY_STRUCTURE.adoc | 2 +- docs/VSH_IMPROVEMENTS.adoc | 2 +- guix.scm | 28 ------------------- scripts/generate-badges.sh | 4 +-- 11 files changed, 16 insertions(+), 44 deletions(-) rename {.githooks => .github/hooks}/validate-a2ml.sh (100%) rename {.githooks => .github/hooks}/validate-k9.sh (100%) delete mode 100644 guix.scm diff --git a/.githooks/validate-a2ml.sh b/.github/hooks/validate-a2ml.sh similarity index 100% rename from .githooks/validate-a2ml.sh rename to .github/hooks/validate-a2ml.sh diff --git a/.githooks/validate-k9.sh b/.github/hooks/validate-k9.sh similarity index 100% rename from .githooks/validate-k9.sh rename to .github/hooks/validate-k9.sh diff --git a/.github/workflows/dogfood-gate.yml b/.github/workflows/dogfood-gate.yml index 341e2a5..e66d199 100644 --- a/.github/workflows/dogfood-gate.yml +++ b/.github/workflows/dogfood-gate.yml @@ -33,7 +33,7 @@ jobs: fi - name: Validate A2ML manifests if: steps.detect.outputs.count > 0 - run: bash .githooks/validate-a2ml.sh + run: bash .github/hooks/validate-a2ml.sh - name: Write summary run: | A2ML_COUNT="${{ steps.detect.outputs.count }}" @@ -74,7 +74,7 @@ jobs: fi - name: Validate K9 contracts if: steps.detect.outputs.k9_count > 0 - run: bash .githooks/validate-k9.sh + run: bash .github/hooks/validate-k9.sh - name: Write summary run: | K9_COUNT="${{ steps.detect.outputs.k9_count }}" diff --git a/.machine_readable/contractiles/Justfile b/.machine_readable/contractiles/Justfile index 6799dfe..b4479fe 100644 --- a/.machine_readable/contractiles/Justfile +++ b/.machine_readable/contractiles/Justfile @@ -476,8 +476,8 @@ self-assess: echo " → KEEP if others might build with Guix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1160,11 +1160,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Guix development shell (fallback) guix-shell: diff --git a/Justfile b/Justfile index 6799dfe..b4479fe 100644 --- a/Justfile +++ b/Justfile @@ -476,8 +476,8 @@ self-assess: echo " → KEEP if others might build with Guix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1160,11 +1160,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Guix development shell (fallback) guix-shell: diff --git a/RSR_OUTLINE.adoc b/RSR_OUTLINE.adoc index 73ca731..d56b17e 100644 --- a/RSR_OUTLINE.adoc +++ b/RSR_OUTLINE.adoc @@ -37,7 +37,7 @@ git init sed -i 's/RSR-template-repo/my-project/g' Justfile guix.scm README.adoc # Enter development environment -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Validate compliance just validate-rsr diff --git a/docs/CICD_HYPER_A_INTEGRATION.adoc b/docs/CICD_HYPER_A_INTEGRATION.adoc index 923dcd3..c1a3a2d 100644 --- a/docs/CICD_HYPER_A_INTEGRATION.adoc +++ b/docs/CICD_HYPER_A_INTEGRATION.adoc @@ -262,7 +262,7 @@ guix-build: extends: .guix-base stage: build script: - - guix build -f guix.scm + - guix build -f build/guix.scm guix-check: extends: .guix-base diff --git a/docs/DIRECTORY_STRUCTURE.adoc b/docs/DIRECTORY_STRUCTURE.adoc index 4ca97a1..c5f24bf 100644 --- a/docs/DIRECTORY_STRUCTURE.adoc +++ b/docs/DIRECTORY_STRUCTURE.adoc @@ -112,7 +112,7 @@ One paragraph description. [source,bash] ---- -guix shell -D -f guix.scm # Enter dev environment +guix shell -D -f build/guix.scm # Enter dev environment just setup # Initialize just build # Build just test # Test diff --git a/docs/VSH_IMPROVEMENTS.adoc b/docs/VSH_IMPROVEMENTS.adoc index c6fe7e7..4222f48 100644 --- a/docs/VSH_IMPROVEMENTS.adoc +++ b/docs/VSH_IMPROVEMENTS.adoc @@ -276,7 +276,7 @@ guix shell rust cargo guix shell -m guix.scm # Build package -guix build -f guix.scm +guix build -f build/guix.scm # Update channels guix pull --channels=channels.scm diff --git a/guix.scm b/guix.scm deleted file mode 100644 index 514203f..0000000 --- a/guix.scm +++ /dev/null @@ -1,28 +0,0 @@ -;; SPDX-License-Identifier: MPL-2.0 -;; Guix development environment. -;; Usage: guix shell -D -f guix.scm - -(use-modules (guix packages) - (guix build-system gnu) - (guix licenses) - (gnu packages base) - (gnu packages bash) - (gnu packages base) - (gnu packages java) - (gnu packages rust) - (gnu packages cmake) - (gnu packages zig) - (gnu packages golang) - (gnu packages node) - (gnu packages python)) - -(package - (name "conative-gating") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash make openjdk rust cmake zig go node python)) - (synopsis "conative-gating") - (description "conative-gating — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/conative-gating") - (license (@ (guix licenses) mpl2.0))) diff --git a/scripts/generate-badges.sh b/scripts/generate-badges.sh index 5b6e806..3e71405 100644 --- a/scripts/generate-badges.sh +++ b/scripts/generate-badges.sh @@ -16,7 +16,7 @@ detect_tier() { if [ -f "*.adb" ] 2>/dev/null; then echo "1"; return; fi if [ -f "*.hs" ] 2>/dev/null; then echo "1"; return; fi if ls *.ncl >/dev/null 2>&1 || [ -d "config" ] && ls config/*.ncl >/dev/null 2>&1; then echo "2"; return; fi - if [ -f "flake.nix" ] || [ -f "guix.scm" ]; then echo "2"; return; fi + if [ -f "flake.nix" ] || [ -f "build/guix.scm" ]; then echo "2"; return; fi echo "Infra" } @@ -120,7 +120,7 @@ MATURITY=$(read_maturity) MAT_COLOR=$(maturity_color "$MATURITY") # Check infrastructure -HAS_GUIX=$( [ -f "guix.scm" ] || [ -f ".guix-channel" ] && echo "yes" || echo "no" ) +HAS_GUIX=$( [ -f "build/guix.scm" ] || [ -f ".guix-channel" ] && echo "yes" || echo "no" ) HAS_NIX=$( [ -f "flake.nix" ] && echo "yes" || echo "no" ) HAS_CONTAINER=$( [ -f "Containerfile" ] || [ -f "Dockerfile" ] && echo "yes" || echo "no" ) HAS_GITHUB=$( [ -d ".github/workflows" ] && echo "yes" || echo "no" )