From b362835d0bfce14f9232e1e7be0f72cb698f00c1 Mon Sep 17 00:00:00 2001
From: Eric Theise <erictheise@gmail.com>
Date: Wed, 10 Jul 2024 18:49:35 -0700
Subject: [PATCH] Part of
 https://github.com/OpenHistoricalMap/issues/issues/786, adjusting workflow.

---
 .github/workflows/ohm.upstream-sync.yml | 42 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml
index c08505d0..b22237ff 100644
--- a/.github/workflows/ohm.upstream-sync.yml
+++ b/.github/workflows/ohm.upstream-sync.yml
@@ -16,25 +16,12 @@ jobs:
         shell: bash
     steps:
       - name: Check out our repository
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-#      - name: Delete previous sacrificial branch
-#        run: |
-#          git branch -D 'the-sacrifice'
-      - name: Create new sacrificial branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: peterjgrainger/action-create-branch@v3.0.0
-        with:
-          branch: 'the-sacrifice'
-      - name: Check out sacrificial branch
-        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: 'the-sacrifice'
+
       - name: Check out upstream master
         env:
           UPSTREAM: https://github.com/tyrasd/overpass-turbo
@@ -43,7 +30,26 @@ jobs:
           git config --global user.email "github-actions@users.noreply.github.com"
           git remote add upstream "${UPSTREAM}"
           git fetch upstream master
-      - name: Make our script executable
-        run: chmod +x ./scripts/upstream_sync.sh
-      - name: Run sync script
-        run: ./scripts/upstream_sync.sh
+
+      - name: List all branches
+        run: |
+          git branch --all
+
+#      - name: Delete previous sacrificial branch
+#        run: |
+#          git branch -D 'the-sacrifice'
+#      - name: Create new sacrificial branch
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        uses: peterjgrainger/action-create-branch@v3.0.0
+#        with:
+#          branch: 'the-sacrifice'
+#      - name: Check out sacrificial branch
+#        uses: actions/checkout@v4
+#        with:
+#          fetch-depth: 0
+#          ref: 'the-sacrifice'
+#      - name: Make our script executable
+#        run: chmod +x ./scripts/upstream_sync.sh
+#      - name: Run sync script
+#        run: ./scripts/upstream_sync.sh