Re: OpenHistoricalMap/issues#885, tweaks.

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

@@ -33,7 +33,7 @@ jobs:
 
       - name: Delete previous sacrificial branch
         run: |
-          if git show-ref --quiet refs/heads/the-sacrifice; then
+          if git show-ref --quiet the-sacrifice; then
             git branch --remote -D origin/the-sacrifice
           fi
 
@@ -43,49 +43,41 @@ jobs:
           git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
           ls -lR ./scripts/ohm
 
-      - name: Check out upstream master
-        env:
-          UPSTREAM: https://github.com/hotosm/tasking-manager
-        run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email '[email protected]'
-          git remote add upstream "${UPSTREAM}"
-          git fetch upstream master
-
-      - name: Check out our repository
-        uses: actions/checkout@v4
+      - name: Create 'the-sacrifice', our new sacrificial branch
+        uses: peterjgrainger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          fetch-depth: 0
-          ref: '885-ci-for-tasking-manager'
+          branch: 'the-sacrifice'
 
       - name: List relevant branches & script directories
         run: |
           git status
           git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
           ls -lR ./scripts/ohm
 
-      - name: Create 'the-sacrifice', our new sacrificial branch
-        uses: peterjgrainger/[email protected]
+      - name: Check out our new sacrificial branch
+        uses: actions/checkout@v4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: 'the-sacrifice'
+          fetch-depth: 0
+          ref: 'the-sacrifice'
 
       - name: List relevant branches & script directories
         run: |
           git status
           git branch --all | egrep '\/main$|\/master$|sacrifice|candidate'
           ls -lR ./scripts/ohm
 
-      - name: Check out our new sacrificial branch
-        uses: actions/checkout@v4
+      - name: Add & fetch upstream master
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          fetch-depth: 0
-          ref: 'the-sacrifice'
+          UPSTREAM: https://github.com/hotosm/tasking-manager
+        run: |
+          git config --global user.name 'github-actions'
+          git config --global user.email '[email protected]'
+          git remote add upstream "${UPSTREAM}"
+          git fetch upstream master
 
       - name: List relevant branches & script directories
         run: |