ci: fix CTO reviewer + harden deploy ssh-keyscan (#3)

* ci: post CTO review as COMMENT instead of APPROVE

GITHUB_TOKEN cannot formally approve PRs without a repo setting toggle.
Verdict is still prominent in the first line of the review body, and
the human merges based on reading it — no behavior loss.

Agent-Session: cowork-reviewer-fix-20260414

* fix(ci): ssh-keyscan failure no longer fails the deploy

ssh-keyscan was being called with set -e in effect and stderr suppressed,
so a single keyscan failure killed the entire deploy with no diagnostic
output. Since rsync/ssh use StrictHostKeyChecking=no, the known_hosts
entry is not load-bearing — making the keyscan best-effort is safe.
stderr is now captured to /tmp/keyscan.err and emitted as a warning so
future failures are debuggable.

Agent-Session: cowork-deploy-fix-20260414
This commit is contained in:
peptiderepo
2026-04-14 16:53:19 +07:00
committed by GitHub
parent 849ff674d7
commit 59e51dae99
2 changed files with 100 additions and 98 deletions

View File

@@ -224,25 +224,22 @@ jobs:
PY PY
- name: Post PR review - name: Post PR review
# Always posts as COMMENT — not APPROVE/REQUEST_CHANGES — because the default
# GITHUB_TOKEN is not permitted to formally approve PRs without toggling a
# repo setting. The verdict is still prominent in the first line of the body
# ("## CTO Review — APPROVE|REQUEST_CHANGES|COMMENT"). Human merges, so the
# GitHub-native review state isn't load-bearing.
if: steps.claude.outputs.skipped != '1' if: steps.claude.outputs.skipped != '1'
uses: actions/github-script@v7 uses: actions/github-script@v7
env:
VERDICT: ${{ steps.claude.outputs.verdict }}
with: with:
script: | script: |
const fs = require('fs'); const fs = require('fs');
const body = fs.readFileSync('/tmp/review-body.md', 'utf8'); const body = fs.readFileSync('/tmp/review-body.md', 'utf8');
const verdict = process.env.VERDICT;
const eventMap = {
'APPROVE': 'APPROVE',
'REQUEST_CHANGES': 'REQUEST_CHANGES',
'COMMENT': 'COMMENT'
};
await github.rest.pulls.createReview({ await github.rest.pulls.createReview({
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
pull_number: context.issue.number, pull_number: context.issue.number,
event: eventMap[verdict] || 'COMMENT', event: 'COMMENT',
body, body,
}); });

View File

@@ -45,7 +45,12 @@ jobs:
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/deploy_key echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/deploy_key
chmod 600 ~/.ssh/deploy_key chmod 600 ~/.ssh/deploy_key
ssh-keyscan -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts 2>/dev/null # Best-effort: keyscan stderr captured for diagnosis but never fatal.
# We use StrictHostKeyChecking=no on the actual ssh/rsync calls anyway.
ssh-keyscan -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts 2>/tmp/keyscan.err || {
echo "::warning::ssh-keyscan failed (non-fatal). stderr:"
cat /tmp/keyscan.err || true
}
- name: Deploy via rsync - name: Deploy via rsync
run: | run: |