Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/dogfood-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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 }}"
Expand Down
8 changes: 4 additions & 4 deletions .machine_readable/contractiles/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion RSR_OUTLINE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/CICD_HYPER_A_INTEGRATION.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/DIRECTORY_STRUCTURE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/VSH_IMPROVEMENTS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions guix.scm

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/generate-badges.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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" )
Expand Down
Loading