Skip to content

Reconcile bootstrap release governance#32

Merged
jmcte merged 3 commits into
mainfrom
codex/bootstrap-release-reconcile
Jun 13, 2026
Merged

Reconcile bootstrap release governance#32
jmcte merged 3 commits into
mainfrom
codex/bootstrap-release-reconcile

Conversation

@jmcte

@jmcte jmcte commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Reconcile Screensaver repo-local bootstrap-managed workflows and governance files.
  • Add generated release build/version helper scripts.
  • Refresh bootstrap release/versioning documentation and manifest release policy.
  • Restore required macOS/Xcode validation for app and CI/governance changes that affect the validation path.

Governing Issue

  • No governing issue is linked. This is maintenance cleanup from the Codex configuration/worktree hygiene pass.

Validation

  • git diff --check origin/main...HEAD
  • bash -n scripts/ci/run-release-build.sh
  • bash -n scripts/ci/run-release-version.sh
  • xcodebuild -project SplitFlap.xcodeproj -scheme SplitFlap -configuration Release -derivedDataPath build ONLY_ACTIVE_ARCH=NO build
  • GitHub PR Fast CI on head 8d7ce6b: Fast Checks, macOS Checks, Validate PR Description, Validate Secrets, and CI Gate passed.

Bootstrap Governance

  • Applied repo-local bootstrap output only with bootstrap apply repo.
  • GitHub settings were not applied.
  • Home-profile changes were not applied.

Merge Automation

  • Auto-merge is not enabled because maintainer review is still required.
  • Use fallback merge-readiness: required checks pass or are intentionally skipped, review is satisfied, and no blocking review state remains.

Notes

  • No application runtime code changed.
  • The branch was rebased onto current origin/main after PR creation to resolve generated workflow conflicts.
  • macOS Checks now runs for Apple source/project changes and CI/governance changes, so workflow/script/bootstrap changes cannot bypass native validation through the Linux-only lane.

@jmcte jmcte requested a review from pheidon as a code owner June 10, 2026 15:45
@jmcte jmcte added status:needs-review PR is ready for Athena review. state:needs-repair PR needs repair before review can proceed. labels Jun 10, 2026 — with ChatGPT Codex Connector

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ff7d6a0ad3

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .github/workflows/pr-fast-ci.yml
Regenerate repo-local bootstrap-managed workflows, release documentation, manifest release policy, and release helper scripts for Screensaver.

Verification: git diff --check; bash -n scripts/ci/run-release-build.sh; bash -n scripts/ci/run-release-version.sh.
@jmcte jmcte force-pushed the codex/bootstrap-release-reconcile branch from ff7d6a0 to 2f8ee74 Compare June 10, 2026 15:55
@jmcte jmcte enabled auto-merge (squash) June 10, 2026 16:39

@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.

The governance cleanup is directionally good, but I found two merge-blocking regressions:

  1. extended-validation no longer performs the macOS/Xcode build for app changes.

    • In /.github/workflows/extended-validation.yml, extended-checks was moved from the dedicated macOS/Xcode runner to ['self-hosted', 'linux', 'shell-only', 'public'].
    • That means app changes can now pass the main post-merge validation lane without ever running xcodebuild, because scripts/ci/run-fast-checks.sh only builds when xcodebuild is present and otherwise silently skips the build step.
    • For a macOS screensaver repo, that drops the only always-on macOS build path from the extended gate.
  2. The secret scanner no longer flags ANTHROPIC_API_KEY=.

    • In scripts/check-detect-secrets.sh, the ANTHROPIC_API_KEY= pattern was removed even though the repo still uses that secret in /.github/workflows/claude.yml.
    • That weakens the repo’s guardrail against accidentally committing or surfacing the Claude auth key in config/docs, and it is a direct regression from the current baseline.

Compact summary: the PR’s bootstrap governance changes are useful, but it regresses release confidence by removing macOS build coverage from extended validation and weakens secret detection for a still-referenced auth secret.

@athena-omt athena-omt removed the status:needs-review PR is ready for Athena review. label Jun 10, 2026
@pheidon

pheidon commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Approval follow-up on review pullrequestreview-4469408811: I would not approve this yet.

That review thread is marked resolved, but the current PR head (2f8ee740) still appears to remove the required macOS validation path:

  • .github/workflows/pr-fast-ci.yml no longer has the apple path detection.
  • The macos-checks job is gone.
  • ci-gate no longer requires macos-checks.
  • scripts/ci/run-fast-checks.sh still exits successfully on Linux when xcodebuild is unavailable.

So the latest green PR Fast CI run is green because the macOS job is absent, not because the app/project changes were compiled on macOS. The claimed fix commit I looked for (5997841) also is not present on the current PR branch.

Please restore a required macOS/Xcode validation path for Screensaver app/project changes before approval.

Restore SplitFlap macOS/Xcode checks to the PR and extended validation gates, and add the Claude API key pattern back to the repository secret scanner.

@pheidon pheidon 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.

Found one remaining blocker on the current head (bd88224c).

/.github/workflows/pr-fast-ci.yml restores macos-checks, but the job only runs when needs.changes.outputs.apple == 'true'. This PR changes .github/workflows/**, scripts/**, and project.bootstrap.yaml, which are app/ci paths but not apple paths, so the current green run skipped macOS validation while modifying the macOS validation gate itself. That leaves workflow/script/governance changes able to alter or break the macOS/Xcode path without exercising it before merge.\n\nPlease make the PR macOS job run for CI/governance changes that affect validation too, e.g. apple == 'true' || ci == 'true' (or another equivalent scope), so changes to the macOS gate cannot pass solely through the Linux shell lane.\n\nI rechecked Athena’s earlier blockers against this head: the ANTHROPIC_API_KEY= scanner pattern has been restored, so I consider that point addressed.

@pheidon pheidon 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.

Still blocking. This PR changes workflow/scripts/bootstrap governance that affect the macOS gate itself, but macOS Checks is skipped because the path filter only treats Apple/source paths as macOS-relevant. A green CI Gate here therefore does not prove the native macOS validation path still works after modifying that path.

Please make macOS validation run for changes to the workflow/scripts/bootstrap surfaces that control it, or add an equivalent required validation path for those governance changes.

@pheidon pheidon added the review:athena Athena review governance requested. label Jun 12, 2026
Make the PR macOS validation job run when CI or governance paths change, so updates to workflow and bootstrap validation surfaces exercise the Xcode lane before merge.

@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.

Approving: the earlier macOS validation gap is now covered, and the required CI checks are passing.

@jmcte

jmcte commented Jun 13, 2026

Copy link
Copy Markdown
Contributor Author

PR #32 repair status:

  • Current head 8d7ce6b keeps the restored required macOS Checks job and runs it when either Apple paths or CI/governance paths change.
  • GitHub PR Fast CI passed on that head, including macOS Checks and CI Gate.
  • I also re-ran local validation from this checkout:
    • git diff --check origin/main...HEAD
    • bash -n scripts/ci/run-release-build.sh
    • bash -n scripts/ci/run-release-version.sh
    • xcodebuild -project SplitFlap.xcodeproj -scheme SplitFlap -configuration Release -derivedDataPath build ONLY_ACTIVE_ARCH=NO build

The remaining blocker appears to be the prior CHANGES_REQUESTED state from Pheidon, not a failing check or unresolved merge conflict. Requesting re-review of the current head.

@pheidon pheidon 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.

Approving: the macOS validation gap is covered on the current head, and the required checks are passing.

@jmcte jmcte merged commit 2c030a6 into main Jun 13, 2026
13 checks passed
@jmcte jmcte deleted the codex/bootstrap-release-reconcile branch June 13, 2026 21:46
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:needs-repair PR needs repair before review can proceed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants