Part of OpenHistoricalMap/issues#786, adjusting workflow.

OpenHistoricalMap · Jul 8, 2024 · 4c5c8b8 · 4c5c8b8
1 parent c96c38f
commit 4c5c8b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml
@@ -28,8 +28,6 @@ jobs:
           git config --global user.email "[email protected]"
           git remote add upstream "${UPSTREAM}"
           git fetch upstream master
-          git branch -D the-sacrifice &>/dev/null  
-          git checkout -b the-sacrifice
       - name: Make our script executable
         run: chmod +x ./scripts/upstream_sync.sh
       - name: Run sync script

diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh
@@ -3,6 +3,9 @@
 # As we enter this script we have created `the-sacrifice` from our `main` branch and
 # have `git fetch`ed upstream/master.
 
+git branch -D the-sacrifice &>/dev/null
+git checkout -b the-sacrifice
+
 if [ ! -d "upstream" ]; then
   mkdir upstream
 fi