From f6abc61ff4f73211ab9085aa61e79ae10971d5c1 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Wed, 12 Dec 2018 00:19:25 +1100 Subject: [PATCH] Work around an edge case for the macOS nightly builds --- installer/macos/build_sqlitebrowser_nightly.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/installer/macos/build_sqlitebrowser_nightly.sh b/installer/macos/build_sqlitebrowser_nightly.sh index 9f4a733b..42b25372 100755 --- a/installer/macos/build_sqlitebrowser_nightly.sh +++ b/installer/macos/build_sqlitebrowser_nightly.sh @@ -74,6 +74,9 @@ git reset --hard HEAD >>$LOG 2>&1 git clean -dffx >>$LOG 2>&1 git pull >>$LOG 2>&1 git checkout $BRANCH >>$LOG 2>&1 +git reset --hard HEAD >>$LOG 2>&1 +git clean -dffx >>$LOG 2>&1 +git pull >>$LOG 2>&1 # Update the translation files echo Updating the translations >>$LOG 2>&1 @@ -142,6 +145,9 @@ cd $HOME/git_repos/sqlitebrowser >>$LOG 2>&1 git reset --hard HEAD >>$LOG 2>&1 git clean -dffx >>$LOG 2>&1 git checkout $BRANCH >>$LOG 2>&1 +git reset --hard HEAD >>$LOG 2>&1 +git clean -dffx >>$LOG 2>&1 +git pull >>$LOG 2>&1 # Update the translation files echo Updating the translations >>$LOG 2>&1