diff --git a/cleanup_builds.sh b/cleanup_builds.sh deleted file mode 100644 index 816cf768d5..0000000000 --- a/cleanup_builds.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/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 bf2f3c36d1..211249bb88 100644 --- a/upload-build.sh +++ b/upload-build.sh @@ -8,15 +8,22 @@ git config --global user.name $GHUSERNAME git clone https://github.com/Anuken/Mindustry.wiki.git cd Mindustry.wiki -DESKFILE=$TRAVIS_BUILD_NUMBER"-desktop-bleeding-edge.jar" +DESKFILE="mindustry-desktop-bleeding-edge.jar" + +if [ -e $DESKFILE ]; then + rm $DESKFILE +fi + cp ../desktop/build/libs/desktop-release.jar $DESKFILE -FILE1="Bleeding-Edge-Build-"$TRAVIS_BUILD_NUMBER".md" +FILE1="Bleeding-Edge-Build.md" -if [ ! -e $FILE1 ]; then - touch $FILE1 +if [ -e $FILE1 ]; then + rm $FILE1 fi +touch $FILE1 + echo "### Commit #"$TRAVIS_COMMIT"." >> $FILE1 echo >> $FILE1 echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 @@ -25,7 +32,4 @@ git add $FILE1 git add $DESKFILE git commit -m "Added a new bleeding edge build" -# now remove old build -bash ../cleanup_builds.sh - git push https://$GHUSERNAME:$GHPASSWORD@github.com/Anuken/Mindustry.wiki.git --all