Cleanups on js-precompiled (#3738)
* Cleanups on js-precompiled * Combined * Adjust based on Pr comments
This commit is contained in:
parent
9e8d90b5ba
commit
5f1021822d
@ -34,11 +34,16 @@ git fetch origin 2>$GITLOG
|
|||||||
git checkout -b $BRANCH
|
git checkout -b $BRANCH
|
||||||
|
|
||||||
echo "*** Committing compiled files for $UTCDATE"
|
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 add .
|
||||||
git commit -m "$UTCDATE"
|
git commit -m "$UTCDATE"
|
||||||
|
|
||||||
echo "*** Merging remote"
|
echo "*** Merging remote"
|
||||||
git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [release]"
|
|
||||||
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
|
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
|
||||||
PRECOMPILED_HASH=`git rev-parse HEAD`
|
PRECOMPILED_HASH=`git rev-parse HEAD`
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user