try to merge results first

galaxyproject · Aug 12, 2024 · 78f5eca · 78f5eca
1 parent 571c231
commit 78f5eca
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/utilities.yml b/.github/workflows/utilities.yml
@@ -36,6 +36,10 @@ jobs:
         - name: Run script 
           run: | 
             python bin/get_public_galaxy_servers.py -o results/available_public_servers.csv
+        - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs
+          run: |
+            cd results &&
+            git pull --no-rebase -s recursive -X ours
         - name: Commit servers 
           uses: s0/git-publish-subdir-action@develop
           env: