Re: OpenHistoricalMap/issues#885, tweaks.

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

@@ -26,8 +26,8 @@ jobs:
 
       - name: List relevant branches & script directories
         run: |
-          git branch --all | egrep 'main|master|sacrifice|candidate'
-          ls -lR ./scripts
+          git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
+          ls -lR ./scripts/ohm
 
       - name: Delete previous sacrificial branch
         run: |
@@ -37,8 +37,8 @@ jobs:
 
       - name: List relevant branches & script directories
         run: |
-          git branch --all | egrep 'main|master|sacrifice|candidate'
-          ls -lR ./scripts
+          git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
+          ls -lR ./scripts/ohm
 
       - name: Check out upstream master
         env:
@@ -59,15 +59,16 @@ jobs:
 
       - name: List relevant branches & script directories
         run: |
-          git branch --all | egrep 'main|master|sacrifice|candidate'
-          ls -lR ./scripts
+          git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
+          ls -lR ./scripts/ohm
 
       - name: Create 'the-sacrifice', our new sacrificial branch
         uses: peterjgrainger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           branch: 'the-sacrifice'
+          sha: ${{ GITHUB_SHA }}
 
       - name: Check out our new sacrificial branch
         uses: actions/checkout@v4
@@ -79,8 +80,8 @@ jobs:
 
       - name: List relevant branches & script directories
         run: |
-          git branch --all | egrep 'main|master|sacrifice|candidate'
-          ls -lR ./scripts
+          git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
+          ls -lR ./scripts/ohm
 
       - name: Make our scripts executable
         run: chmod +x ./scripts/ohm/*.sh