Skip to content

Commit 29a77ed

Browse files
authored
Merge pull request #61120 from Expensify/Rory-FixRebaseRaceCondition
[No QA] Remove --depth=1 to fix rebase
2 parents 3432255 + 9368c13 commit 29a77ed

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/createNewVersion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
132132
if ! git push origin main; then
133133
echo "Race condition! Mobile-Expensify main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
134-
git fetch origin main --depth=1
134+
git fetch origin main
135135
if ! git rebase origin/main; then
136136
echo "::error:: Rebase failed while retrying Mobile-Expensify push"
137137
exit 1
@@ -159,7 +159,7 @@ jobs:
159159
git commit -m "Update Mobile-Expensify submodule version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
160160
if ! git push origin main; then
161161
echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
162-
git fetch origin main --depth=1
162+
git fetch origin main
163163
if ! git rebase origin/main; then
164164
echo "::error:: Rebase failed while retrying Mobile-Expensify push"
165165
exit 1

0 commit comments

Comments
 (0)