Retrying force-with-lease merge strategy

codedmart · Aug 23, 2017 · 35e41d3 · 35e41d3
1 parent 8fa1e15
commit 35e41d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/script/travis-documentation b/script/travis-documentation
@@ -59,9 +59,7 @@ HTML
 git add $BRANCH/index.html
 git commit -m "$BRANCH index build $BUILD_NUMBER"
 
-until git push --quiet "https://${TOKEN}@${ref}" || (( retries++ >= 5 )); do
+until git push --force-with-lease --quiet "https://${TOKEN}@${ref}" || (( retries++ >= 5 )); do
     echo "Retrying git push ..."
-    git pull --force-with-lease origin gh-pages
-    git add $BRANCH/index.html
-    git commit -m "$BRANCH index build $BUILD_NUMBER"
+    git pull --force origin gh-pages
 done
diff --git a/script/travis-lifecycle-script b/script/travis-lifecycle-script
@@ -56,12 +56,11 @@ echo "Copying built documentation to $output/$BRANCH"
 cp -R $root/$LIBRARY-* $BRANCH/
 
 echo "Committing + pushing to $ref"
-git add $BRANCH
-git commit -m "$BRANCH/$LIBRARY build $BUILD_NUMBER"
-
-until git push --quiet "https://${TOKEN}@${ref}" || (( retries++ >= 5 )); do
-    echo "Retrying git push ..."
-    git pull --force-with-lease origin gh-pages
-    git add $BRANCH
+if git add $BRANCH/$LIBRARY-*; then
     git commit -m "$BRANCH/$LIBRARY build $BUILD_NUMBER"
-done
+
+    until git push --force-with-lease --quiet "https://${TOKEN}@${ref}" || (( retries++ >= 5 )); do
+        echo "Retrying git push ..."
+        git pull origin gh-pages
+    done
+fi