From 3ae2aa8b024551fe8f3182dd1dad16d9a28d97f0 Mon Sep 17 00:00:00 2001 From: "Jonathan D.A. Jewell" <6759885+hyperpolymath@users.noreply.github.com> Date: Sat, 19 Sep 2026 09:16:48 +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. * CONTRIBUTING.adoc * bots/echidnabot/guix.scm * bots/the-hotchocolabot/HANDOVER.adoc * bots/the-hotchocolabot/Justfile * bots/the-hotchocolabot/justfile * build/guix.scm (from guix.scm) -> build/guix.scm * robot-repo-automaton/CONTRIBUTING.adoc * robot-repo-automaton/templates/skeleton/Justfile Verified with `git apply --check` against current main before committing; no behaviour change intended, the Justfile entry points keep working. --- CONTRIBUTING.adoc | 2 +- bots/echidnabot/guix.scm | 2 +- bots/the-hotchocolabot/HANDOVER.adoc | 2 +- bots/the-hotchocolabot/Justfile | 2 +- bots/the-hotchocolabot/justfile | 2 +- guix.scm | 28 ------------------- robot-repo-automaton/CONTRIBUTING.adoc | 2 +- .../templates/skeleton/Justfile | 6 ++-- 8 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 guix.scm diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 8b752933..b136d2af 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -5,7 +5,7 @@ gitbot-fleet == Using Guix (recommended for reproducibility) -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm == Or using toolbox/distrobox diff --git a/bots/echidnabot/guix.scm b/bots/echidnabot/guix.scm index c6dd7be8..22b3c6a6 100644 --- a/bots/echidnabot/guix.scm +++ b/bots/echidnabot/guix.scm @@ -1,6 +1,6 @@ ; SPDX-License-Identifier: MPL-2.0 ;; guix.scm — GNU Guix package definition for squisher-corpus -;; Usage: guix shell -f guix.scm +;; Usage: guix shell -f build/guix.scm (use-modules (guix packages) (guix build-system gnu) diff --git a/bots/the-hotchocolabot/HANDOVER.adoc b/bots/the-hotchocolabot/HANDOVER.adoc index 8952573c..8ba86095 100644 --- a/bots/the-hotchocolabot/HANDOVER.adoc +++ b/bots/the-hotchocolabot/HANDOVER.adoc @@ -279,7 +279,7 @@ sudo ./target/release/hotchocolabot [source,bash] ---- # Enter development shell -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Build package guix build diff --git a/bots/the-hotchocolabot/Justfile b/bots/the-hotchocolabot/Justfile index 4586dcaf..525d718b 100644 --- a/bots/the-hotchocolabot/Justfile +++ b/bots/the-hotchocolabot/Justfile @@ -195,7 +195,7 @@ rsr-check: @echo "" @echo "=== Build System ===" @test -f justfile && echo "✓ justfile" || echo "✗ justfile missing" - @test -f guix.scm && echo "✓ guix.scm" || echo "✗ guix.scm missing" + @test -f build/guix.scm && echo "✓ guix.scm" || echo "✗ guix.scm missing" @test -f .github/workflows/rust_ci.yml && echo "✓ CI/CD (GitHub Actions)" || echo "✗ CI/CD missing" @echo "" @echo "=== Test Coverage ===" diff --git a/bots/the-hotchocolabot/justfile b/bots/the-hotchocolabot/justfile index 4586dcaf..525d718b 100644 --- a/bots/the-hotchocolabot/justfile +++ b/bots/the-hotchocolabot/justfile @@ -195,7 +195,7 @@ rsr-check: @echo "" @echo "=== Build System ===" @test -f justfile && echo "✓ justfile" || echo "✗ justfile missing" - @test -f guix.scm && echo "✓ guix.scm" || echo "✗ guix.scm missing" + @test -f build/guix.scm && echo "✓ guix.scm" || echo "✗ guix.scm missing" @test -f .github/workflows/rust_ci.yml && echo "✓ CI/CD (GitHub Actions)" || echo "✗ CI/CD missing" @echo "" @echo "=== Test Coverage ===" diff --git a/guix.scm b/guix.scm deleted file mode 100644 index 8dff9c57..00000000 --- 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 zig) - (gnu packages base) - (gnu packages java) - (gnu packages node) - (gnu packages rust) - (gnu packages golang) - (gnu packages python) - (gnu packages cmake)) - -(package - (name "gitbot-fleet") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash zig make openjdk node rust go python cmake)) - (synopsis "gitbot-fleet") - (description "gitbot-fleet — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/gitbot-fleet") - (license ((@@ (guix licenses) license) "MPL-2.0" "https://github.com/hyperpolymath/palimpsest-license"))) diff --git a/robot-repo-automaton/CONTRIBUTING.adoc b/robot-repo-automaton/CONTRIBUTING.adoc index d4ec56ff..3177ffff 100644 --- a/robot-repo-automaton/CONTRIBUTING.adoc +++ b/robot-repo-automaton/CONTRIBUTING.adoc @@ -4,7 +4,7 @@ git clone https://github.com/hyperpolymath/robot-repo-automaton.git cd robot-repo-automaton = Using Guix (recommended for reproducibility) -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm = Or using toolbox/distrobox toolbox create robot-repo-automaton-dev diff --git a/robot-repo-automaton/templates/skeleton/Justfile b/robot-repo-automaton/templates/skeleton/Justfile index e59e9aba..d39fe7d4 100644 --- a/robot-repo-automaton/templates/skeleton/Justfile +++ b/robot-repo-automaton/templates/skeleton/Justfile @@ -566,15 +566,15 @@ 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 guix-shell: - @if [ -f "guix.scm" ]; then guix shell -D -f guix.scm; else echo "No guix.scm"; fi + @if [ -f "build/guix.scm" ]; then guix shell -D -f build/guix.scm; else echo "No guix.scm"; fi # ═══════════════════════════════════════════════════════════════════════════════ # HYBRID AUTOMATION