diff --git a/.travis.yml b/.travis.yml index 3ea0e7558d..06a66fa107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,5 +18,6 @@ script: after_success: - chmod +x upload-build.sh + - chmod +x cleanup_builds.sh - ./upload-build.sh diff --git a/cleanup_builds.sh b/cleanup_builds.sh new file mode 100644 index 0000000000..816cf768d5 --- /dev/null +++ b/cleanup_builds.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +OLD_TRAVIS_BUILD_NUMBER=`expr $TRAVIS_BUILD_NUMBER - 7` +OLD_DESKFILE=$OLD_TRAVIS_BUILD_BUMBER"-desktop-bleeding-edge.jar" +OLD_FILE1="Bleeding-Edge-Build-"$OLD_TRAVIS_BUILD_NUMBER".md" + +if [ -e $OLD_FILE1 ]; then + rm -f $OLD_FILE1 + rm -f $OLD_DESKFILE + git add $OLD_FILE1 + git add $OLD_DESKFILE +fi diff --git a/upload-build.sh b/upload-build.sh index 118c6d1185..a58b3c50db 100644 --- a/upload-build.sh +++ b/upload-build.sh @@ -17,23 +17,14 @@ if [ ! -e $FILE1 ]; then touch $FILE1 fi -echo "### Commit #"$TRAVIS_COMMIT" Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 +NEWLINE="\n" +echo "### Commit #"$TRAVIS_COMMIT".${NEWLINE}Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 git add $FILE1 git add $DESKFILE git commit -m "Added a new bleeding edge build" # now remove old build - -OLD_TRAVIS_BUILD_NUMBER=`expr $TRAVIS_BUILD_NUMBER - 7` -OLD_DESKFILE=$OLD_TRAVIS_BUILD_BUMBER"-desktop-bleeding-edge.jar" -OLD_FILE1="Bleeding-Edge-Build-"$OLD_TRAVIS_BUILD_NUMBER".md" - -if [ -e $OLD_FILE1 ]; then - rm -f $OLD_FILE1 - rm -f $OLD_DESKFILE - git add $OLD_FILE1 - git add $OLD_DESKFILE -fi +./cleanup_builds.sh git push https://$GHUSERNAME:$GHPASSWORD@github.com/Anuken/Mindustry.wiki.git --all