From fb80cf6190c3b34c09d65bf966fdeab3c2fdfd8b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 8 Dec 2016 15:20:53 +0100 Subject: [PATCH] Add existing release files before merge (#3747) --- js/scripts/release.sh | 4 +++- js/scripts/test.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index ff09a5ba8..aaafba87e 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -35,13 +35,15 @@ git checkout -b $BRANCH echo "*** Committing compiled files for $UTCDATE" mv build ../build.new +git add . +git commit -m "$UTCDATE [update]" git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" git rm build/* git commit -m "$UTCDATE [cleanup]" mv -f ../build.new/* build/ rm -rf ../build.new git add . -git commit -m "$UTCDATE [update]" +git commit -m "$UTCDATE [release]" echo "*** Merging remote" git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG diff --git a/js/scripts/test.js b/js/scripts/test.js index 829d1f8c3..ded13a298 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script 2 +// test script 3