ArrProfiles/.github/workflows
Claude 1add4d97cf
fix(workflow): Correct upstream sync to preserve custom files and push to stable
Fixed two critical issues in the sync-upstream.yml workflow:

1. Wildcard conflict resolution: The previous logic used wildcards (profiles/*.yml)
   that overlapped with custom files (profiles/*Micro*.yml), causing custom files
   to be overwritten. Now uses a two-phase explicit merge strategy:
   - Phase 1: Accept all upstream changes
   - Phase 2: Explicitly restore custom files by exact path

2. Wrong push target: Changed from 'main || master' to 'stable' branch

This ensures weekly syncs will now work correctly while preserving:
- profiles/1080p Micro.yml, 720p Micro.yml
- custom_formats/Micro Encode Tier 1/2/3.yml
- regex_patterns/BONE.yml, ETHEL.yml, GalaxyRG.yml, TGx.yml
- custom_formats/Foreign Release Groups.yml
2025-11-20 01:36:27 +00:00
..
devSync.yml feat(workflow): add devSync workflow to sync dev branch with stable on PR 2025-09-15 06:44:36 +09:30
notify.yml chore(cleanup): remove bundle script/workflow, remove wiki/devlog entries, remove tiers, update notify script to run on dev, simplify README 2025-09-13 00:10:32 -05:00
sync-upstream.yml fix(workflow): Correct upstream sync to preserve custom files and push to stable 2025-11-20 01:36:27 +00:00