From 41781fde2d4040ff769ec006d4af70e63f12af48 Mon Sep 17 00:00:00 2001 From: Riccardo Balbo Date: Sat, 7 Jul 2018 18:22:15 +0200 Subject: [PATCH] Fix CI --- .travis.yml | 21 ++++++++++++++------- build.sh | 11 ++++++++++- 2 files changed, 24 insertions(+), 8 deletions(-) mode change 100644 => 100755 build.sh diff --git a/.travis.yml b/.travis.yml index 86c565c..b92580b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,25 @@ sudo: required language: java +sudo: required +dist: trusty os: - linux notifications: email: true -env: - - LINUX=1 - - WINDOWS=1 +before_script: +- "chmod +x build.sh" +- sudo apt-get install -y p7zip-full ".*-mingw-w64-.*" script: -- ./build.sh travis +- "./build.sh travis" deploy: provider: releases - api_key: "" - file: "build/libs/dist/*" skip_cleanup: true + api_key: + secure: AcElsRkeJFBNdOjfdn0YDLJjRp/FaEknVJdl9zs7lkdsIKXapeKtXrg9Q6brvkNtBNqFoUBlkqdGQoFUUaAl/lNob7kndluUwYFKPN30e909oY1kRzC4DohUd0hsN60nzZe+LtvOCT7MweAEMeyuBTSvEVegLeOEhOauwiY8oQeyMQ9vdVp+d8czoG9YJEi0R5Svtm4/O8/NRVrt4xyC4hbFKdoupV889PBNRr4wiMBqzPG2gOGqLEXC/SxcGgzgw+rnJsN0bmiIS0LT7lMy2moI9jYpsDjIwe0Euy5c7kq7ELForJxkryx/GHZVyeKwFYgWMxgNKRj7hy7jHUkvmkBIMI+H1H+6SWYCWmKSa06jwJ2mIaRxwDW56GXSZHSFioRi6wx1mA3k7Lr5kPuOpdDTlYux2pGULwsZ1NqJ3hl2oZ9P2Q+TPlMuz5pksovmJdXFgMJMRCPtC/phRGx/1YbQpg3hFVNabXUM/LoSsYboC0a2bsW1i5ivuKA8hvjk9hr4L0YUWYBa8nBmbpK4r+msA/5BPZcCV2Nh6Arbd9Re/3y45IGHAJVsoFs99w50M0EPelsxEVeaNK7d7ExHKdRiT5vSYlwMdK7FK/tLRniqhptuRkooVuq7Gj9uOjlKPTXLu/wNm4ugj7LBr3grcsR0jakzscxY5eaPnQydEXU= + file_glob: true + file: + - build/libs/dist/DDS*.jar + - build/libs/dist/DDS*-win64.exe + - build/libs/dist/DDS*-linux64 on: - tags: true \ No newline at end of file + tags: true diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index cadd9e5..cc7997b --- a/build.sh +++ b/build.sh @@ -1,8 +1,10 @@ #!/bin/bash +set -e ./gradlew clean - if [ "$1" = "travis" ]; then + WINDOWS=1 + LINUX=1 if [ "$TRAVIS_TAG" != "" ]; then args="-Pin_version=$TRAVIS_TAG" @@ -20,10 +22,17 @@ chmod +x *.sh rm -Rvf dist if [ "$LINUX" != "" ]; then + echo "Build linux bundle" ./make-linux-bundle.sh fi if [ "$WINDOWS" != "" ]; then + echo "Build windows bundle" ./make-windows-bundle.sh fi + +echo "Build generic bundle" ./make-generic-bundle.sh + +ls -lh dist/ +echo "Done" \ No newline at end of file