Merge pull request #36 from MonsieurBon/fix-build

Fetch some more history to be able to merge
swisspost · Dec 5, 2024 · 395a3d0 · 395a3d0
2 parents 246c8fe + 3d87589
commit 395a3d0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -44,8 +44,8 @@ jobs:
 
     - name: Merge back to develop
       run: |
-        git fetch --depth 2 origin develop
+        git fetch --depth 10 origin develop
         git checkout develop
-        git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop~2)" origin master develop
         git merge master --no-edit
         git push origin develop