Spaces:
Sleeping
Sleeping
Commit ·
3ee49ed
1
Parent(s): c0b1ac7
Remove temporary document fidelity merge diagnostic workflow
Browse files
.github/workflows/mvp-document-fidelity-merge-diagnostic.yml
DELETED
|
@@ -1,45 +0,0 @@
|
|
| 1 |
-
name: MVP document fidelity merge diagnostic
|
| 2 |
-
|
| 3 |
-
on:
|
| 4 |
-
push:
|
| 5 |
-
branches:
|
| 6 |
-
- main
|
| 7 |
-
paths:
|
| 8 |
-
- operator_triggers/mvp_document_fidelity_merge_diagnostic.txt
|
| 9 |
-
|
| 10 |
-
permissions:
|
| 11 |
-
contents: write
|
| 12 |
-
|
| 13 |
-
jobs:
|
| 14 |
-
diagnose:
|
| 15 |
-
runs-on: ubuntu-latest
|
| 16 |
-
steps:
|
| 17 |
-
- name: Check out implementation branch
|
| 18 |
-
uses: actions/checkout@v4
|
| 19 |
-
with:
|
| 20 |
-
ref: scrub-mvp-document-hygiene-fidelity-hardening
|
| 21 |
-
fetch-depth: 0
|
| 22 |
-
|
| 23 |
-
- name: Diagnose merge against current main
|
| 24 |
-
shell: bash
|
| 25 |
-
run: |
|
| 26 |
-
set +e
|
| 27 |
-
git fetch origin main
|
| 28 |
-
{
|
| 29 |
-
echo "branch_head=$(git rev-parse HEAD)"
|
| 30 |
-
echo "main_head=$(git rev-parse origin/main)"
|
| 31 |
-
git merge-tree --write-tree HEAD origin/main
|
| 32 |
-
status=$?
|
| 33 |
-
echo "merge_tree_status=$status"
|
| 34 |
-
echo "conflict_summary:"
|
| 35 |
-
git merge-tree $(git merge-base HEAD origin/main) HEAD origin/main | grep '^changed in both\|^added in both\|^removed in' -A6 || true
|
| 36 |
-
} > /tmp/mvp_document_fidelity_merge_diagnostic.log 2>&1
|
| 37 |
-
|
| 38 |
-
git config user.name 'solidprivacy-diagnostic-worker'
|
| 39 |
-
git config user.email 'actions@users.noreply.github.com'
|
| 40 |
-
git checkout -B mvp-document-fidelity-main-sync-evidence-20260717 origin/main
|
| 41 |
-
mkdir -p output/validation
|
| 42 |
-
cp /tmp/mvp_document_fidelity_merge_diagnostic.log output/validation/mvp_document_fidelity_merge_diagnostic.log
|
| 43 |
-
git add output/validation/mvp_document_fidelity_merge_diagnostic.log
|
| 44 |
-
git commit -m 'Record document fidelity merge diagnostic' || true
|
| 45 |
-
git push --force origin HEAD:mvp-document-fidelity-main-sync-evidence-20260717
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|