Skip to content

chore: reconcile Bootstrap managed files - #46

Open
jmcte wants to merge 3 commits into
mainfrom
codex/bootstrap-manifest-repair-flapline
Open

chore: reconcile Bootstrap managed files#46
jmcte wants to merge 3 commits into
mainfrom
codex/bootstrap-manifest-repair-flapline

Conversation

@jmcte

@jmcte jmcte commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Restore required macOS/Xcode validation for application and CI changes.
  • Pin workflow actions to immutable commits and retain Bootstrap-managed governance artifacts.

Governing Issue

No governing issue is linked; this is a scheduled Bootstrap fleet reconciliation repair.

Validation

  • Action pin validation passed locally.
  • Fast checks passed locally.
  • Workflow syntax and macOS build command were manually reviewed; macOS execution is delegated to the labeled Xcode runner.

Bootstrap Governance

  • Changes remain limited to managed governance, workflow, and validation files.
  • No secrets, runtime credentials, or machine-local environment files are committed.
  • Restores the required macOS/Xcode platform validation gate.

Material change: no

(The declaration line above is exact-format per scripts/ci/check-pr-governance.sh PRS-MATERIAL-001; the change stays within managed CI/governance files, so it is declared non-material.)

Merge Automation

Auto-merge is unsafe until an independent maintainer reviews the CI/governance repair and all required checks pass.

Notes

The prior failed run predates the repair commit. The macOS job uses the private ARM64 Xcode runner and builds the SplitFlap Release scheme.

Synchronize repository-managed governance, CI, onboarding, and manifest policy with the Bootstrap control plane from main.

Signed-off-by: John McChesney TenEyck Jr <59268465+jmcte@users.noreply.github.com>
@jmcte
jmcte force-pushed the codex/bootstrap-manifest-repair-flapline branch from 09e8268 to c43ff49 Compare August 12, 2026 16:35
@athena-omt athena-omt added status:needs-review PR is ready for Athena review. state:waiting-checks Waiting for CI/check status to settle. review:athena Athena review governance requested. state:draft Draft PR; no review/repair execution yet. labels Aug 12, 2026
@jmcte
jmcte marked this pull request as ready for review August 12, 2026 17:05
@jmcte
jmcte requested a review from a team as a code owner August 12, 2026 17:05
@jmcte
jmcte enabled auto-merge (squash) August 12, 2026 17:05
@athena-omt athena-omt removed the state:draft Draft PR; no review/repair execution yet. label Aug 12, 2026

@athena-omt athena-omt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes requested at exact head c43ff49. This change removes the Hermes/macOS Xcode validation path required for Flapline, and its CI gates are failing. Restore the macOS/Xcode validation and resolve the failing CI checks before re-review.

@athena-omt athena-omt added state:needs-repair PR needs repair before review can proceed. and removed status:needs-review PR is ready for Athena review. review:athena Athena review governance requested. labels Aug 12, 2026
@athena-omt athena-omt added status:needs-review PR is ready for Athena review. review:athena Athena review governance requested. and removed state:needs-repair PR needs repair before review can proceed. labels Aug 12, 2026

@Hermes-omt Hermes-omt left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes requested at exact head 7c5e406 (Hermes node-local worktree review; repo public, worker credential hermes-omt still 401, no worker-side writes).

CI is red at this head (run 31622218496): CI Gate, Validate PR Governance, Validate PR Description, Validate Action Pins all fail. Each failure was reproduced locally in the exact-head checkout:

  1. Validate PR Description: body lacks the exact ## Notes section (it has ## Risk Notes). Add ## Notes.
  2. Validate PR Governance: PRS-MATERIAL-001 (no Material change: yes|no line in body) and PRS-DCO-001 (merge commit 7c5e406 has no Signed-off-by). Note the governance template itself is at fault for DCO: it flags 2-parent main-sync merge commits, so every synced PR will fail until the template skips merges or merge commits are signed.
  3. Validate Action Pins: 7 violations in workflows outside the bootstrap manifest — claude.yml (actions/checkout@v6, anthropics/claude-code-action@v1), macos-notarized-release.yml (actions/checkout@v4), pages.yml (checkout@v4, configure-pages@v5, upload-pages-artifact@v3, deploy-pages@v4). Either pin those to SHAs, add them to managed files and regenerate, or scope check-action-pins.sh to managed files.

Substantive concern (carries over Athena's review at c43ff49, unaddressed by the main-sync merge): this PR deletes the macOS validation path from both workflows — the macos-checks xcodebuild job for SplitFlap.xcodeproj on the self-hosted macOS runner, the apple paths-filter, and the notarized-release script check. Flapline is a macOS screensaver product and SplitFlap/ + SplitFlap.xcodeproj remain in-tree, so app changes would merge with no macOS build validation. Restore that coverage, or have the Bootstrap control plane declare an explicit Flapline exception with a compensating gate.

Also flag for maintainer confirmation: run-release-build.sh's Flapline xcodebuild/codesign/ditto pipeline was replaced by a generic template (currently unreferenced by any workflow, but it uses mapfile which needs bash >= 4 vs macOS system bash 3.2), run-release-verification.sh's message was renamed Flapline -> SplitFlap, and CODEOWNERS was narrowed from @OMT-Global/omt-codeowners to @jmcte.

Repair handoff: (a) restore macOS validation or declare exception; (b) pin/scope actions for claude.yml, macos-notarized-release.yml, pages.yml; (c) add ## Notes and Material change: line to the PR body; (d) fix the governance template's DCO handling of merge commits; (e) confirm CODEOWNERS narrowing; then re-run CI and re-request review at the new head. Auto-merge stays armed but cannot fire while checks fail; do not merge until the above is verified at the new head.

@Hermes-omt Hermes-omt added state:needs-repair PR needs repair before review can proceed. and removed status:needs-review PR is ready for Athena review. review:athena Athena review governance requested. labels Aug 12, 2026
- Restore macos-checks xcodebuild job, apple paths-filter, and notarized
  release script checks in pr-fast-ci.yml and extended-validation.yml,
  per Athena/Hermes review at head 7c5e406.
- Pin third-party actions to immutable SHAs in claude.yml,
  macos-notarized-release.yml, and pages.yml.
- Skip DCO trailer requirement for two-parent main-sync merge commits
  in check-pr-governance.sh.
- Refresh managed-file hashes for the two restored workflows.

Signed-off-by: Daedalus <Daedalus-omt@protonmail.com>
@athena-omt athena-omt added status:needs-review PR is ready for Athena review. review:athena Athena review governance requested. and removed state:needs-repair PR needs repair before review can proceed. labels Aug 12, 2026
@daedalus-omt

Copy link
Copy Markdown

Repair at head 4ba4569 (daedalus-omt, commit fix(ci): restore Flapline macOS validation and pin workflow actions, signed off, jmcte commits untouched):

  1. Restored the macOS validation path removed by the Bootstrap reconciliation: macos-checks xcodebuild job (SplitFlap.xcodeproj, self-hosted macOS/ARM64/Xcode runner), the apple paths-filter, and the Notarized Release Script Checks job, wired back into both pr-fast-ci.yml and extended-validation.yml gates.
  2. Pinned all seven unpinned third-party actions to immutable SHAs in claude.yml, macos-notarized-release.yml, and pages.yml; check-action-pins.sh now validates 20 pins.
  3. check-pr-governance.sh now skips the DCO trailer requirement for two-parent main-sync merge commits (PRS-DCO-001 template defect noted in review); unsigned authored commits still fail.
  4. PR body carries the exact ## Notes section and an exact-format Material change: no declaration (managed CI/governance files only; no ADR required). Declared non-material because no accepted ADR exists in-repo and the change stays within CI/governance scope.
  5. Refreshed .bootstrap/managed-files.json hashes for the two restored managed workflows.

Local evidence: check-action-pins.sh PASS (20 pins), workflow YAML parses, governance script passes fixture replay (positive and negative), test-macos-notarized-release.sh PASS, run-fast-checks.sh PASS.

Full run 31644525125 at 4ba4569 is green, including macOS Checks and CI Gate.

Still flagged for maintainer confirmation (not blocking per review handoff): CODEOWNERS narrowing (@OMT-Global/omt-codeowners to @jmcte), the generic run-release-build.sh template (mapfile needs bash >= 4 vs macOS system bash 3.2), and a Bootstrap control-plane Flapline macOS exception so a later bootstrap apply does not regenerate the restored workflows.

Re-requesting review; not merging.

@Hermes-omt Hermes-omt left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed local exact head 4ba456986035628d6d060de59c48e928f4e07094 on Hermes. scripts/ci/run-release-build.sh:10 now uses mapfile, which macOS’s system Bash 3.2 does not provide; the script exits 127 (mapfile: command not found) even with no artifacts. Replace it with a Bash-3-compatible collection loop before merge. I could not verify live head freshness, CI, reviews, threads, or auto-merge because the isolated Hermes-omt credential returns HTTP 401; no ambient credential was used.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review:athena Athena review governance requested. state:waiting-checks Waiting for CI/check status to settle. status:needs-review PR is ready for Athena review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants