Part of OpenHistoricalMap/issues#786, adjusting workflow.

.github/workflows/ohm.upstream-sync.yml

@@ -15,18 +15,21 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Create sacrificial branch
+      - name: Delete previous sacrificial branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git branch -D 'the-sacrifice'
+      - name: Create new sacrificial branch
         uses: peterjgrainger/[email protected]
         with:
           branch: 'the-sacrifice'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Check out our repository
+      - name: Check main out to sacrificial branch
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: 'the-sacrifice'
-      - name: Check out the upstream repository
+      - name: Check out upstream master
         env:
           UPSTREAM: https://github.com/tyrasd/overpass-turbo
         run: |

scripts/upstream_sync.sh

@@ -21,19 +21,20 @@ fi
 git status
 
 git merge --no-ff --no-commit upstream/master
-#concerns=('js/ide.js' 'js/map.ts')
-#for i in $(git diff --name-only --diff-filter=U --relative);do
-#  echo "$i"
-#  for c in "${concerns[@]}";do
-#    echo "$c"
-#    if [[ $i != $c ]];then
-#      git checkout --theirs -- $i
-#      git add $i
-#    fi
-#  done
-#done
-#
-#if [ -n "$(git status --porcelain)" ]; then
-#  iso=$(date -Iminutes)
-#  git commit -m "Merge upstream ("$iso")."
-#fi
+concerns=('js/ide.js' 'js/map.ts')
+for i in $(git diff --name-only --diff-filter=U --relative);do
+  echo "$i"
+  for c in "${concerns[@]}";do
+    echo "$c"
+    if [[ $i != $c ]];then
+      git checkout --theirs -- $i
+      git add $i
+    fi
+  done
+done
+
+if [ -n "$(git status --porcelain)" ]; then
+  iso=$(date -Iminutes)
+  git commit -m "Merge upstream ("$iso")."
+fi
+git push origin the-sacrifice