Merge pull request #755 from kynesyslabs/merge/stabilisation-into-petri #843
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Preserve Claude Memory Files | |
| on: | |
| push: | |
| branches: ["**"] | |
| jobs: | |
| preserve-claude: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout repository | |
| uses: actions/checkout@v4 | |
| with: | |
| fetch-depth: 2 | |
| token: ${{ secrets.GITHUB_TOKEN }} | |
| - name: Check if this was a merge commit | |
| id: check_merge | |
| run: | | |
| if git log -1 --pretty=format:"%P" | grep -q " "; then | |
| echo "is_merge=true" >> $GITHUB_OUTPUT | |
| echo "✅ Detected merge commit" | |
| else | |
| echo "is_merge=false" >> $GITHUB_OUTPUT | |
| exit 0 | |
| fi | |
| - name: Check for .claude changes in merge | |
| if: steps.check_merge.outputs.is_merge == 'true' | |
| id: check_claude | |
| run: | | |
| if git log -1 --name-only | grep -q "^\.claude/"; then | |
| echo "claude_changed=true" >> $GITHUB_OUTPUT | |
| echo "🚨 .claude files were modified in merge - will revert!" | |
| else | |
| echo "claude_changed=false" >> $GITHUB_OUTPUT | |
| exit 0 | |
| fi | |
| - name: Revert .claude to pre-merge state | |
| if: steps.check_merge.outputs.is_merge == 'true' && steps.check_claude.outputs.claude_changed == 'true' | |
| run: | | |
| CURRENT_BRANCH=$(git branch --show-current) | |
| echo "🔄 Reverting .claude/ to pre-merge state on $CURRENT_BRANCH" | |
| MERGE_BASE=$(git log -1 --pretty=format:"%P" | cut -d' ' -f1) | |
| git checkout $MERGE_BASE -- .claude/ 2>/dev/null || echo "No .claude in base commit" | |
| git config user.name "github-actions[bot]" | |
| git config user.email "41898282+github-actions[bot]@users.noreply.github.com" | |
| if git diff --staged --quiet; then | |
| git add .claude/ | |
| fi | |
| if ! git diff --cached --quiet; then | |
| git commit -m "🔒 Preserve branch-specific .claude files | |
| Reverted .claude/ changes from merge to keep $CURRENT_BRANCH version. | |
| [skip ci]" | |
| git push origin $CURRENT_BRANCH | |
| echo "✅ Successfully preserved $CURRENT_BRANCH .claude files" | |
| else | |
| echo "ℹ️ No changes to revert" | |
| fi |