## Plan: Create Scheduled Workflow to Merge Starbase Changes - [x] Create a GitHub Actions workflow that: - [x] Runs on a weekly schedule (every Monday at 9:00 AM UTC) - [x] Can also be triggered manually via workflow_dispatch - [x] Triggers on PRs that modify the workflow file for testing (posts comment with detailed conflict information instead of creating PR) - [x] Fetches latest changes from starbase repository - [x] Handles merge conflicts with intelligent resolution: - [x] Always uses starbase version for infrastructure files (common.mk) - [x] Detects and analyzes project-specific changes (e.g., "starcraft" → "craft-platforms") - [x] Provides structured guidance for resolving remaining conflicts - [x] Regenerates uv.lock file after merging to reflect dependency changes - [x] Creates a PR with the merged changes (without labels) - [x] Includes guidance in PR description about using GitHub Copilot to review changes - [x] Marks PRs as draft and assigns to @lengau when conflicts are detected - [x] Asks GitHub Copilot for suggestions on resolving conflicts - [x] Shows detailed conflict information (file list and diff hunks) in PR test comments - [x] Gracefully handles the case when already up-to-date with starbase - [x] Handles unrelated git histories between repositories - [x] Includes workflow files from starbase in the merge (with actions:write permission) - [x] Validate YAML syntax - [x] Add documentation explaining the starbase integration - [x] Request code review (no issues found) - [x] Run security scan (no vulnerabilities found) - [x] Address all PR feedback ## Summary Workflow now properly handles all scenarios with intelligent conflict resolution: 1. **Weekly schedule** (Monday 9:00 AM UTC) 2. **Manual workflow_dispatch** 3. **Pull requests** that modify the workflow file - posts a detailed comment showing: - List of conflicted files - Actual conflict details (diff hunks with conflict markers) in an expandable section - Conflict resolution strategy applied - Guidance to use GitHub Copilot for resolution 4. **Already up-to-date**: Exits successfully when no changes are needed 5. **Clean merge**: Creates PR with merged changes (no labels applied) 6. **Conflicts with intelligent resolution**: - **Strategy 1 - Starbase-only files**: Files like `common.mk` always use starbase version (maintained in starbase) - **Strategy 2 - Project-specific detection**: Analyzes conflicts to detect project-specific customizations (e.g., project name changes from "starcraft" to "craft-platforms") - **Structured guidance**: Provides clear guidance on which conflicts should keep local changes vs accept starbase changes - Marks PR as draft and assigns to @lengau - Detailed resolution strategy logged in step summary 7. **Dependency management**: Automatically regenerates `uv.lock` using `uv lock` command after merging to keep dependencies in sync 8. **Unrelated histories**: Uses `--allow-unrelated-histories` flag 9. **Workflow files**: Included in merge with `actions: write` permission All code is properly formatted with prettier. - Fixes canonical/craft-platforms#189 <!-- START COPILOT CODING AGENT SUFFIX --> <details> <summary>Original prompt</summary> > > ---- > > *This section details on the original issue you should resolve* > > <issue_title>Merge Starbase every week</issue_title> > <issue_description>Create a scheduled workflow (which can also be run manually) that merges the latest changes from starbase (https://github.com/canonical/starbase) and uses Copilot to determine which changes from starbase to pull vs. which changes from craft-platforms.</issue_description> > > ## Comments on the Issue (you are @copilot in this section) > > <comments> > </comments> > </details> - Fixes canonical/craft-platforms#189 <!-- START COPILOT CODING AGENT TIPS --> --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs.