Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/sync-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Create publisher token
- name: Create Operator Stack Publisher token
id: app-token
uses: actions/create-github-app-token@v3
with:
Expand Down Expand Up @@ -109,5 +109,13 @@ jobs:
--body-file "$body_file")"
echo "Opened generated PR: $pr_url"
else
pr_url="$existing"
echo "Updated existing PR: $existing"
fi
required_checks="$(gh api "repos/operatorstack/interlock/branches/main/protection/required_status_checks" --jq '(.contexts // []) + ([.checks[]?.context] // []) | unique | length')"
if [[ "$required_checks" -lt 1 ]]; then
echo "BLOCKED: main has no required status checks; refusing unsafe auto-merge." >&2
exit 1
fi
gh pr merge "$pr_url" --auto --squash
echo "Native auto-merge requested; branch protection owns merge eligibility."
Loading