diff --git a/releases/build-bundle-win64.bat b/releases/build-bundle-win64.bat index fbed355d7..f3c58dfc4 100755 --- a/releases/build-bundle-win64.bat +++ b/releases/build-bundle-win64.bat @@ -26,7 +26,7 @@ CALL DEL wekan-%1-amd64-windows.zip CALL 7z a wekan-%1-amd64-windows.zip bundle ECHO 6) Copying WeKan.zip to sync directory -CALL COPY wekan-%1-amd64-windows.zip Y:\ +CALL COPY wekan-%1-amd64-windows.zip Z:\ ECHO 7) Done. Starting WeKan. CD bundle diff --git a/releases/rel.sh b/releases/rel.sh index e456a19d6..aeee82820 100755 --- a/releases/rel.sh +++ b/releases/rel.sh @@ -8,8 +8,7 @@ if [ $# -ne 1 ] fi -mkdir /Users/wekan/Downloads/rel$1 -mv /Users/wekan/repos/wekan/wekan-$1*.zip /Users/wekan/Downloads/rel$1/ -mv /Users/wekan/Downloads/WindowsJaettu/wekan-$1-amd64-windows.zip /Users/wekan/Downloads/rel$1/ -curl -O https://releases.wekan.team/wekan-$1-amd64.zip -mv /Users/wekan/repos/wekan/wekan-$1-amd64.zip /Users/wekan/Downloads/rel$1/wekan-$1-amd64.zip +mkdir ~/rel$1 +mv ~/repos/wekan/wekan-$1*.zip /home/wekan/rel$1/ +mv ~/Julkinen/wekan-$1*.zip /home/wekan/rel$1/ +mv /home/wekan/repos/wekan/.build/wekan-$1-amd64.zip /home/wekan/rel$1/wekan-$1-amd64.zip diff --git a/releases/release-bundle.sh b/releases/release-bundle.sh index f7666d2ca..f791eaf9d 100755 --- a/releases/release-bundle.sh +++ b/releases/release-bundle.sh @@ -1,16 +1,9 @@ -if [[ "$OSTYPE" == "linux-gnu" ]]; then - sudo apt-get -y install parallel - cd ~/repos/wekan - ./releases/rebuild-release.sh - cd ~/repos/wekan/.build - zip -r wekan-$1-amd64.zip bundle -elif [[ "$OSTYPE" == "darwin"* ]]; then - brew install parallel - cd /Users/wekan/repos/wekan - ./releases/rebuild-release.sh - cd ~/repos/wekan/.build - zip -r wekan-$1-amd64.zip bundle -fi +cd ~/repos/wekan +sudo apt-get -y install parallel +./releases/rebuild-release.sh +#./releases/delete-phantomjs.sh +cd ~/repos/wekan/.build +zip -r wekan-$1-amd64.zip bundle { scp ~/repos/wekan/releases/build-bundle-arm64.sh a:/home/wekan/ diff --git a/releases/release.sh b/releases/release.sh index 2039053d9..ba53bc5a8 100755 --- a/releases/release.sh +++ b/releases/release.sh @@ -25,7 +25,7 @@ git push git push # 5) Build Bundle -#~/repos/wekan/releases/release-bundle.sh $1 +~/repos/wekan/releases/release-bundle.sh $1 # 6) Build Sandstorm #~/repos/wekan/releases/release-sandstorm.sh $1 diff --git a/releases/up-w.sh b/releases/up-w.sh index b9cfcade5..f314f8545 100755 --- a/releases/up-w.sh +++ b/releases/up-w.sh @@ -11,4 +11,4 @@ if [ $# -ne 1 ] fi # 2) Upload windows release to download server -scp /Users/wekan/Downloads/WindowsJaettu/wekan-$1-amd64-windows.zip x2:/data/websites/releases.wekan.team/windows/ +scp ../../Julkinen/wekan-$1-amd64-windows.zip x2:/data/websites/releases.wekan.team/windows/ diff --git a/releases/up.sh b/releases/up.sh index ec046e4fc..1a2b05586 100755 --- a/releases/up.sh +++ b/releases/up.sh @@ -11,12 +11,7 @@ if [ $# -ne 1 ] fi # 2) Install parallel if it's not installed yet - -if [[ "$OSTYPE" == "linux-gnu" ]]; then - sudo apt-get -y install parallel -elif [[ "$OSTYPE" == "darwin"* ]]; then - brew install parallel -fi +sudo apt-get -y install parallel # 3) Download releases from build servers and # upload releases to download server,