Uh oh!
There was an error while loading. Please reload this page.
chore(ci): prune upstream workflows and add upstream sync - #61
Conversation
Remove 27 upstream-only workflows not needed for internal fork. Keep: typecheck, test (linux only), pr-standards, pr-management, generate. Add: upstream-sync workflow (weekly, excludes .github/workflows/). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This PR doesn't fully meet our contributing guidelines and PR template. What needs to be fixed:
Please edit this PR description to address the above within 2 hours, or it will be automatically closed. If you believe this was flagged incorrectly, please let a maintainer know. |
There was a problem hiding this comment.
Pull request overview
This PR streamlines CI for the internal fork by removing upstream-only GitHub Actions workflows, simplifying the remaining test workflow to Linux-only, and adding an automated upstream synchronization workflow that preserves the fork’s custom workflows.
Changes:
- Removed 27 upstream-only workflows to declutter Actions and avoid failing/irrelevant runs in the fork.
- Simplified
.github/workflows/test.ymlto run unit + e2e on Linux only (no Windows matrix). - Added
.github/workflows/upstream-sync.ymlto periodically mergeanomalyco/opencodechanges intodevwhile excluding.github/workflows/.
Reviewed changes
Copilot reviewed 29 out of 29 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| .github/workflows/upstream-sync.yml | New scheduled/manual workflow to sync upstream dev into fork dev while discarding workflow directory changes. |
| .github/workflows/test.yml | Removes Windows matrix and hardcodes Linux runner + artifact/check naming. |
| .github/workflows/vouch-manage-by-issue.yml | Removed upstream-only vouch management workflow. |
| .github/workflows/vouch-check-pr.yml | Removed upstream-only vouch PR gate workflow. |
| .github/workflows/vouch-check-issue.yml | Removed upstream-only vouch issue gate workflow. |
| .github/workflows/triage.yml | Removed upstream-only issue triage automation workflow. |
| .github/workflows/sync-zed-extension.yml | Removed upstream-only Zed extension sync workflow. |
| .github/workflows/storybook.yml | Removed upstream-only Storybook build workflow. |
| .github/workflows/stats.yml | Removed upstream-only stats generation workflow. |
| .github/workflows/review.yml | Removed upstream-only AI review workflow. |
| .github/workflows/release-github-action.yml | Removed upstream-only GitHub Action release workflow. |
| .github/workflows/publish.yml | Removed upstream-only publish/release pipeline workflow. |
| .github/workflows/publish-vscode.yml | Removed upstream-only VS Code publish workflow. |
| .github/workflows/publish-github-action.yml | Removed upstream-only GitHub Action publish workflow. |
| .github/workflows/opencode.yml | Removed upstream-only opencode command workflow. |
| .github/workflows/notify-discord.yml | Removed upstream-only Discord notification workflow. |
| .github/workflows/nix-hashes.yml | Removed upstream-only Nix hashes workflow. |
| .github/workflows/nix-eval.yml | Removed upstream-only Nix evaluation workflow. |
| .github/workflows/duplicate-issues.yml | Removed upstream-only duplicate-issues workflow. |
| .github/workflows/docs-update.yml | Removed upstream-only docs update automation workflow. |
| .github/workflows/docs-locale-sync.yml | Removed upstream-only docs locale sync workflow. |
| .github/workflows/deploy.yml | Removed upstream-only deploy workflow. |
| .github/workflows/daily-pr-recap.yml | Removed upstream-only daily PR recap workflow. |
| .github/workflows/daily-issues-recap.yml | Removed upstream-only daily issues recap workflow. |
| .github/workflows/containers.yml | Removed upstream-only containers build workflow. |
| .github/workflows/compliance-close.yml | Removed upstream-only compliance auto-close workflow. |
| .github/workflows/close-stale-prs.yml | Removed upstream-only stale PR closer workflow. |
| .github/workflows/close-issues.yml | Removed upstream-only stale issues closer workflow. |
| .github/workflows/beta.yml | Removed upstream-only beta sync workflow. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| git merge upstream/dev --no-commit --no-ff || true | ||
| # Restore our fork's workflows (discard upstream workflow changes) | ||
| git checkout HEAD -- .github/workflows/ || true |
There was a problem hiding this comment.
git merge upstream/dev --no-commit --no-ff || true will mask merge failures/conflicts and then subsequent steps continue in a potentially conflicted state (and git commit will fail with unmerged paths). Consider removing the || true and explicitly handling conflicts (e.g., abort the merge and exit non-zero with a clear message) so the workflow fails fast and predictably when upstream can’t be merged cleanly.
| git merge upstream/dev --no-commit --no-ff || true | |
| # Restore our fork's workflows (discard upstream workflow changes) | |
| git checkout HEAD -- .github/workflows/ || true | |
| if ! git merge upstream/dev --no-commit --no-ff; then | |
| echo "Failed to merge upstream/dev cleanly; aborting sync." | |
| git merge --abort || true | |
| exit 1 | |
| fi | |
| # Restore our fork's workflows (discard upstream workflow changes) | |
| git checkout HEAD -- .github/workflows/ |
| # Check if there are actual changes to commit | ||
| if git diff --cached --quiet && git diff --quiet; then | ||
| echo "No changes to sync" | ||
| exit 0 | ||
| fi |
There was a problem hiding this comment.
The “No changes to sync” path exits the merge step successfully, but the job will still proceed to “Create PR”, creating/pushing an empty branch and opening a no-op PR. Suggest setting an output/env flag when a commit is created (or when diffs exist) and add an if: condition on the PR-creation step so it only runs when there are actual changes.
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| BRANCH="chore/upstream-sync-$(date +%Y%m%d)" |
There was a problem hiding this comment.
BRANCH="chore/upstream-sync-$(date +%Y%m%d)" can collide on reruns (manual dispatch, retries, or multiple runs in a day), causing git push or gh pr create to fail. Consider including github.run_id/github.run_attempt or a timestamp with time-of-day, or detect and reuse/update an existing branch/PR for the day.
| BRANCH="chore/upstream-sync-$(date +%Y%m%d)" | |
| BRANCH="chore/upstream-sync-$(date +%Y%m%d)-${{ github.run_id }}-${{ github.run_attempt }}" |
Uh oh!
There was an error while loading. Please reload this page.
Summary
Closes#60
upstream-sync.yml: weekly sync from anomalyco/opencode excluding.github/workflows/Kept workflows (5)
typecheck.yml— type checking on PRtest.yml— unit + e2e on Linux onlypr-standards.yml— PR title/format validationpr-management.yml— duplicate check + labelsgenerate.yml— code generation on dev pushAdded workflows (1)
upstream-sync.yml— weekly fetch from upstream, creates PR with workflow directory excludedRemoved workflows (27)
deploy, publish, beta, nix-eval, nix-hashes, containers, storybook,
discord, vouch (3), triage, review, opencode, stats, docs (2),
daily recaps (2), close-issues, close-stale-prs, compliance-close,
duplicate-issues, publish-vscode, publish-github-action,
release-github-action, sync-zed-extension
🤖 Generated with Claude Code