Add branch-specific PR workflow documentation with dash-based naming convention#608
Add branch-specific PR workflow documentation with dash-based naming convention#608
Conversation
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
|
No. The deploy branch already exists @copilot |
You're absolutely right - the deploy branch already existed. My fix only addressed the ESLint error by removing the unused Warning Firewall rules blocked me from connecting to one or more addressesI tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
|
what changes need to be made to the 'deploy' branch @copilot ? |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
The Required change: Remove the unused parameter: // Before:
const handleAuthSuccess = (token, octokitInstance) => {
// After:
const handleAuthSuccess = (token) => {This prevents the landing page deployment workflow from building successfully since it defaults to the |
|
now i get an error: which preumambly i can remove the laodCommentForPRs similar to the last fix. However this make we wonder why we are removing them - have we lost functionality somehwere? Looking at the code, I think maybe we should be using BranchListing.js from this commit rather than https://github.com/litlfred/sgex/blob/f2a4d762740e30b75ae7c6b90fabae21be36f631/src/components/BranchListing.js |
|
@copilot which preumambly i can remove the laodCommentForPRs similar to the last fix. However this make we wonder why we are removing them - have we lost functionality somehwere? Looking at the code, I think maybe we should be using BranchListing.js from this commit rather than https://github.com/litlfred/sgex/blob/f2a4d762740e30b75ae7c6b90fabae21be36f631/src/components/BranchListing.js |
... You're absolutely right to be concerned about losing functionality. The Before removing it, we should understand what it was supposed to do. Could you share the content around line 354 in
... I can't directly access the deploy branch or the specific commit you referenced (f2a4d76) from my current environment. To do a comprehensive functionality comparison, I would need:
Could you provide both files so I can:
This will help us make the right decision about whether to remove the unused variables or restore the missing functionality. |
|
BranchListing.f2a4d76.js.txt |
I've performed a thorough analysis of both BranchListing files. Here's the comprehensive functionality comparison: BranchListing.f2a4d76.js (1,137 lines) - Streamlined PR-only versionUser Functionality:
BranchListing.deploy.js (1,385 lines) - Comprehensive dual-purpose versionUser Functionality:
Key Differences:
Recommendation:The |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
|
i am not sure what the gituhb action workflows are tyring to achieve. please remove. please make sure that all references to naming branches like copilot/fix-{number} or copilot/{branch}-fix-{number} have their slashes replaced with dash, so copilot-fix-{number} or copilot-{branch}-fix-{number} ideally branch nanems are allphanumberic and dashes only |
… only
- Remove .github/workflows/branch-specific-fix-automation.yml per user request
- Update branch naming convention from copilot/fix-{number} to copilot-fix-{number}
- Update branch naming for other branches from copilot/{branch}-fix-{number} to copilot-{branch}-fix-{number}
- Ensure all branch names are alphanumeric and dashes only as requested
- Updated documentation in .github/copilot-instructions.md, public/docs/branch-specific-pr-workflow.md, and READY.md
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
I've addressed all your requests in commit 17d26f1: ✅ Removed GitHub Actions workflow - Deleted ✅ Updated branch naming convention to use dashes only:
✅ Ensured alphanumeric and dashes only - All documentation now reflects dash-based naming that properly handles branch names with slashes (e.g., Updated files:
The branch-specific PR workflow documentation remains intact but now uses the simpler, cleaner naming convention you requested. |
|
To resolve the ready.MD, please just use the upstream changes @copilot |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
I've restored READY.md to use the upstream changes (commit 9c5e2fb). The file now shows the original branch naming format with arrow notation: |
|
Oops. Revert back and resolve the condiments so that you're using the dashes instead of the slash @copilot |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
Fixed READY.md to use consistent dash-based branch naming throughout. Removed the arrow notation |
|
please propose a solution to READY.md conflicts @copilot by reviewing the upstream changes |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
I've resolved the READY.md conflicts by restoring the upstream format while updating it for the current branch. The solution maintains the arrow notation ( |
|
remove your changes to READY.md @copilot |
Co-authored-by: litlfred <662242+litlfred@users.noreply.github.com>
Done. Reverted READY.md to its original upstream state, removing all my changes to the file. (commit 4f0b8dd) |
This PR establishes a comprehensive framework for creating pull requests that target branches other than
main, addressing the need to fix issues in deployment branches and feature branches without affecting the main development workflow.Problem
The project uses a multi-branch deployment strategy where different branches serve different purposes (main, deploy, feature branches). When issues arise in these non-main branches, there was no structured approach to create targeted fixes, leading to:
Solution
Branch Naming Convention
Established standardized naming pattern using alphanumeric characters and dashes only:
copilot-fix-{issue_number}copilot-{target_branch}-fix-{issue_number}Examples:
copilot-deploy-fix-607for fixing issue branch selector landing page #607 in deploy branchcopilot-feature-new-ui-fix-123for fixing issue Add GitHub repository link and branch selection to DAK dashboard #123 in feature/new-ui branchComprehensive Documentation
Added detailed documentation covering:
Updated Project Infrastructure
.github/copilot-instructions.mdlocationBenefits
This framework directly addresses the deploy branch ESLint issue mentioned in #607 and provides infrastructure for similar future scenarios across any branch in the repository.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.