Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Cleanups on js-precompiled #3738

Merged
merged 4 commits into from
Dec 7, 2016
Merged

Cleanups on js-precompiled #3738

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5afcffd
Cleanups on js-precompiled
jacogr Dec 7, 2016
e8a67da
Combined
jacogr Dec 7, 2016
e45aafa
Adjust based on Pr comments
jacogr Dec 7, 2016
4d72be7
Merge branch 'master' into jg-js-precompiled
jacogr Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion js/scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down