commit 3bcd5eaca4e05dd6bae3062c03ed80c4b4eb5324 Author: hiro <hiro@torproject.org> Date: Fri Sep 6 12:56:40 2019 +0200 Script update_files should delete branches and prune repository before uploading files --- scripts/update_files | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index ce8fb88..924db45 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -25,7 +25,7 @@ for row in $( if [[ $r = *[!\ ]* ]]; then wget $r git fetch --all - git checkout releases + git checkout -b releases git add . git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' diffs=$(git diff origin/releases) @@ -34,8 +34,7 @@ for row in $( else git push -f --follow-tags origin releases fi - git checkout torbrowser-releases - git merge releases + git checkout -b torbrowser-releases diffs=$(git diff github/torbrowser-releases) if [ -z "$diffs" ]; then echo "No new releases"