diff --git a/js/scripts/release.sh b/js/scripts/release.sh index ee2f6e0a6..fa62cd249 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -35,9 +35,9 @@ 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 pull origin/$BRANCH --commit --no-edit -X ours git rm build/* -git commit -m "$UTCDATE [rm]" +git commit -m "$UTCDATE [rm old]" mv -f ../build.new/* build/ rm -rf ../build.new git add . diff --git a/js/scripts/test.js b/js/scripts/test.js new file mode 100644 index 000000000..d29038fa8 --- /dev/null +++ b/js/scripts/test.js @@ -0,0 +1 @@ +// test script