PR_13_STRATEGY.md•2.69 kB
# PR #13 Merge Strategy - Post Context Compaction
## Current Situation
- **PR #13**: "Medium Priority #2: Add comprehensive workflow caching"
- **Status**: CONFLICTING - cannot merge due to our workflow fixes
- **Base commit**: 5a7097b (Critical Fix #3)
- **Current main**: 25af343+ (many commits ahead)
## Why Conflicts Exist
We completely rewrote the cross-platform workflows during our fixes:
- **Old workflow**: 586 lines, complex structure, had startup_failures
- **New workflow**: ~60 lines, clean, stable (4/4 success rate)
- **PR #13 targets**: Old complex workflow that no longer exists
## Strategy: Extract & Apply (Not Merge)
1. **Don't try to merge** the old workflow changes
2. **Extract the caching concepts** from PR #13
3. **Apply caching to our current clean workflows**
## Key Caching Code to Extract:
### TypeScript Build Cache
```yaml
- name: Cache TypeScript build
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
with:
path: |
dist/
*.tsbuildinfo
key: typescript-build-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('src/**/*.ts', 'tsconfig*.json', 'package-lock.json') }}
restore-keys: |
typescript-build-${{ runner.os }}-${{ matrix.node-version }}-
typescript-build-${{ runner.os }}-
```
### Jest Test Cache
```yaml
- name: Cache Jest
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
with:
path: |
.jest-cache/
coverage/
node_modules/.cache/jest/
key: jest-cache-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('__tests__/**/*.ts', 'jest.config.*', 'package-lock.json') }}
restore-keys: |
jest-cache-${{ runner.os }}-${{ matrix.node-version }}-
jest-cache-${{ runner.os }}-
```
## Target Files to Enhance
- `.github/workflows/cross-platform-simple.yml` (our reliable workflow)
- `.github/workflows/cross-platform.yml` (main workflow)
## Execution Plan (Post-Compaction)
1. `gh pr checkout 13`
2. `git rebase main` (expect conflicts)
3. Resolve by keeping current workflow structure
4. Apply caching blocks at appropriate points in workflows
5. Test cache key generation works with current structure
6. Update PR description to reflect new approach
7. Push and merge
## Performance Benefits Expected
- **Build time**: 30-50% reduction
- **Test execution**: 20-40% faster
- **Overall workflow**: 15-30% improvement
- **Resource efficiency**: Better GitHub Actions utilization
## Critical Success Factors
- Keep our current stable workflow structure
- Only add caching, don't change core workflow logic
- Ensure cache keys are properly scoped by OS and Node.js version
- Verify cache paths match our current build/test setup