From 5f1021822d4180833c085eb9cebd3d76dc0ff7f5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 7 Dec 2016 21:38:28 +0100 Subject: [PATCH] Cleanups on js-precompiled (#3738) * Cleanups on js-precompiled * Combined * Adjust based on Pr comments --- js/scripts/release.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index 3ff4a577c..ee2f6e0a6 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -34,11 +34,16 @@ git fetch origin 2>$GITLOG git checkout -b $BRANCH echo "*** Committing compiled files for $UTCDATE" +mv build ../build.new +git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" +git rm build/* +git commit -m "$UTCDATE [rm]" +mv -f ../build.new/* build/ +rm -rf ../build.new git add . git commit -m "$UTCDATE" echo "*** Merging remote" -git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [release]" git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG PRECOMPILED_HASH=`git rev-parse HEAD`