Merge pull request #33 from MonsieurBon/fix-build

Fix build
swisspost · Nov 29, 2024 · 0d58e32 · 0d58e32
2 parents 70562bf + e4c093e
commit 0d58e32
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 1 origin develop
+        git fetch --depth 2 origin develop
         git checkout develop
-        git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
         git merge master --no-edit
         git push origin develop