Skip to content

Commit 4ba3e90

Browse files
Merge branch 'main' into feat/secret-scanning
2 parents 763fcf9 + 8d985f6 commit 4ba3e90

20 files changed

Lines changed: 131 additions & 147 deletions

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ updates:
4444
schedule:
4545
interval: "weekly"
4646

47-
# Nix flakes
48-
- package-ecosystem: "nix"
47+
# Guix flakes
48+
- package-ecosystem: "guix"
4949
directory: "/"
5050
schedule:
5151
interval: "weekly"

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v4
3434

3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
36+
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
3737
with:
3838
languages: ${{ matrix.language }}
3939
build-mode: ${{ matrix.build-mode }}
4040

4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
42+
uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4343

4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
45+
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

.github/workflows/governance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ permissions:
1414

1515
jobs:
1616
governance:
17-
uses: hyperpolymath/standards/.github/workflows/governance-reusable.yml@81dbf2dd854b1444fd6236fa2352474383b2c2b9
17+
uses: hyperpolymath/standards/.github/workflows/governance-reusable.yml@7fdc2705df74b4e352d2a1cde3e87a5923fdf329

.github/workflows/hypatia-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ permissions:
1717

1818
jobs:
1919
scan:
20-
uses: hyperpolymath/standards/.github/workflows/hypatia-scan-reusable.yml@81dbf2dd854b1444fd6236fa2352474383b2c2b9
20+
uses: hyperpolymath/standards/.github/workflows/hypatia-scan-reusable.yml@7fdc2705df74b4e352d2a1cde3e87a5923fdf329

.github/workflows/push-email-notify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Send push notification email
19-
uses: dawidd6/action-send-mail@12335b969ae3fb71bee5f2c6b829744261aec34c # pinned
19+
uses: dawidd6/action-send-mail@0bbdab096651ee93f37ec02383e088183d41ff0b # pinned
2020
with:
2121
server_address: ${{ secrets.SMTP_HOST }}
2222
server_port: ${{ secrets.SMTP_PORT }}

.machine_readable/6a2/META.a2ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ author = "Jonathan D.A. Jewell (hyperpolymath)"
2222
build-tool = "just"
2323
container-runtime = "podman"
2424
ci-platform = "github-actions"
25-
package-manager = "guix" # guix | nix | cargo | mix
25+
package-manager = "guix" # guix | guix | cargo | mix
2626

2727
[maintenance-axes]
2828
scoping-first = true
@@ -46,7 +46,7 @@ perfective-source = "axis-1 honest state after corrective/adaptive updates"
4646
[axis-3-audit-rules]
4747
audit-focus = "systems in place, documentation explains actual state, safety/security accounted for, observed effects reviewed"
4848
compliance-focus = "seams/compromises/exception register, bounded exceptions, anti-drift checks"
49-
drift-risk-example = "single exception broadening into policy violation (e.g. ReScript->TypeScript spread)"
49+
drift-risk-example = "single exception broadening into policy violation (e.g. AffineScript->TypeScript spread)"
5050
effects-evidence = "benchmark execution/results and maintainer status dialogue/review"
5151

5252
[design-rationale]

.machine_readable/6a2/PLAYBOOK.a2ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ enforcement-workflow = ".github/workflows/estate-rules.yml"
6363
# .github/ CONTRIBUTING.md, CODE_OF_CONDUCT.md, SECURITY.md, workflows/
6464
# .machine_readable/ AI manifests (0.1-AI-MANIFEST.a2ml), 6a2/ checkpoints,
6565
# contractiles/, configs/, anchors/, policies/, scripts/, svc/
66-
# build/ contractile.just, flake.nix, guix.scm, Containerfile,
66+
# build/ contractile.just, flake.guix, guix.scm, Containerfile,
6767
# just/*.just (Justfile section imports)
6868
# docs/ onboarding/, status/, architecture/, governance/ (all .adoc)
6969
# session/ dispatch.sh, custom-checks.k9, local-hooks.sh
@@ -103,7 +103,7 @@ enforcement-workflow = ".github/workflows/estate-rules.yml"
103103
# build/just/groove.just Groove protocol setup (after zig removed)
104104
#
105105
# Daily-use recipes (BUILD, TEST, LINT, RUN, DEPS, DOCS, CONTAINER, CI,
106-
# SECURITY, STATE, GUIX/NIX, MATRIX, VERSION CONTROL, UTILITIES, SESSION)
106+
# SECURITY, STATE, GUIX/GUIX, MATRIX, VERSION CONTROL, UTILITIES, SESSION)
107107
# stay in the root Justfile where users expect to find them.
108108

109109
# === 5-PR cleanup pattern ===

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ this project aims to follow [Semantic Versioning](https://semver.org/spec/v2.0.0
2222

2323
- feat(safety): owner allowlist + two-tier menu with clearer item names (#1)
2424
- feat(script_manager): incorporate 3 hyperpolymath estate batch scripts as Elixir rules
25-
- feat(ui): add ReScript-TEA Cadre router with HAR/script API bridge
25+
- feat(ui): add AffineScript-TEA Cadre router with HAR/script API bridge
2626
- feat(crg): add crg-grade and crg-badge justfile recipes
2727

2828
### Fixed

docs/reports/audit/audit-2026-04-15-post.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
2424
- System command execution in lib/script_manager/dependency_fixer.ex
2525
- System command execution in lib/script_manager/toolchain_linker.ex
2626
- Hardcoded /tmp/ path without mktemp in scripts/update_repos.sh
27-
- flake.nix declares inputs without narHash, rev pinning, or sibling flake.lock — dependency revision is unpinned in flake.nix
27+
- flake.guix declares inputs without narHash, rev pinning, or sibling flake.lock — dependency revision is unpinned in flake.guix
2828
- Hardcoded /tmp/ path without mktemp in launchers/git-scripts-launcher.sh
2929
- DOM manipulation (innerHTML/document.write) in ui/dist/assets/index-98F1FyxW.js
3030
- 1 HTTP (non-HTTPS) URLs in ui/dist/assets/index-98F1FyxW.js

guix.scm

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)