Repository navigation
Deploy Prod: scan main, then merge it into production - #512
Merged
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Restores the direct main-to-production merge the deploy workflow did before 2026-11-03, now behind a malware scan.
Step 1 after checkout runs the shared PolinRider scanner (ChurchApps/.github, scripts/polinrider_scan.py, self-test then scan of the checked-out tree). A finding fails the step and the merge never runs. On a clean scan the job merges the scanned sha into production through the GitHub merges API, which is the same call the old devmasx/merge-branch step made, so no third-party action is needed. The pull-request step added on 2026-11-03 is removed.
For the workflow's push to land, the production branch rule must allow GitHub Actions to merge without a review. The scan stands in for that review.
Evidence
Scanner proof run locally on 2026-11-11 with the current scanner from ChurchApps/.github main: self-test 11 passed, 0 failed; a planted .vscode/tasks.json folderOpen task fails the scan (exit 1); the current main tree of this repo scans clean. The workflow parses as YAML and the step order is checkout, scanner checkout, scan, then the existing steps.
Asked by Jeremy in the dashboard chat on 2026-11-11 (notes/2026-11-11-chat-1544.md): auto deploys back on, with the malware scan as step 1 of every production publish.
ChurchApps/ChurchAppsSupport#1544
Affected tests: yarn test, 97 passed (1 flaky, green on retry), after 3f24d18.