Skip to content

Commit 0d58e32

Browse files
authored
Merge pull request #33 from MonsieurBon/fix-build
Fix build
2 parents 70562bf + e4c093e commit 0d58e32

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444

4545
- name: Merge back to develop
4646
run: |
47-
git fetch --depth 1 origin develop
47+
git fetch --depth 2 origin develop
4848
git checkout develop
49-
git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
49+
git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
5050
git merge master --no-edit
5151
git push origin develop

0 commit comments

Comments
 (0)