From a7da6cb3d986ae25a8aec10020c9636a8be7f98d Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 30 Aug 2016 23:10:10 +0200 Subject: [PATCH 1/5] . --- .travis.yml | 1 - .travis/travis_build.sh | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 570a81ed..36cd47e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ cache: - $HOME/brew-cache notifications: email: false - slack: hyperiondevteam:JHOhorlTVgcYKwT6Tj1nnGou language: cpp matrix: include: diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index 0c84cf20..f4a3f055 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -15,18 +15,26 @@ else procs=4 fi - -# Compile hyperion - +# compile prepare mkdir build || exit 1 cd build -cmake -DPLATFORM=x86-dev -DCMAKE_BUILD_TYPE=Debug .. || exit 2 -make -j$(nproc) || exit 3 +# Compile hyperion for tags +if [[ -n $TRAVIS_TAG ]] + echo "This is a tag build" + exit 10 + cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Release .. || exit 2 + make -j$(nproc) || exit 3 +# Compile hyperion for cron or PR +else + cmake -DPLATFORM=x86-dev -DCMAKE_BUILD_TYPE=Debug .. || exit 4 + make -j$(nproc) || exit 5 +fi + # Build the package on Linux if [[ $TRAVIS_OS_NAME == 'linux' ]]; then - make -j$(nproc) package || exit 4 + make -j$(nproc) package || exit 6 fi From 73258809d1ac646dcfb5a6b07189045b82c27226 Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 30 Aug 2016 23:15:59 +0200 Subject: [PATCH 2/5] le --- .travis/travis_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index f4a3f055..2c1f955f 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -21,7 +21,7 @@ cd build # Compile hyperion for tags if [[ -n $TRAVIS_TAG ]] - echo "This is a tag build" + echo "This is a tag build " exit 10 cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Release .. || exit 2 make -j$(nproc) || exit 3 From 146d7b67f7f750d75082e1f832c77ed754425f76 Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 30 Aug 2016 23:19:04 +0200 Subject: [PATCH 3/5] stu --- .travis/travis_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index 2c1f955f..119c117a 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -20,7 +20,7 @@ mkdir build || exit 1 cd build # Compile hyperion for tags -if [[ -n $TRAVIS_TAG ]] +if [[ -n $TRAVIS_TAG ]]; then echo "This is a tag build " exit 10 cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Release .. || exit 2 From c5beedf2417e86b3f681516001b4fe2b7da9156d Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 30 Aug 2016 23:39:07 +0200 Subject: [PATCH 4/5] done --- .travis/travis_build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index 119c117a..f3148e6c 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -21,8 +21,6 @@ cd build # Compile hyperion for tags if [[ -n $TRAVIS_TAG ]]; then - echo "This is a tag build " - exit 10 cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Release .. || exit 2 make -j$(nproc) || exit 3 From f6a8c8eb01d381fc6af95f4f52fef6b6dccac679 Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 30 Aug 2016 23:51:32 +0200 Subject: [PATCH 5/5] Events [skip ci] --- .travis/travis_build.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index f3148e6c..8129a208 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -24,15 +24,20 @@ if [[ -n $TRAVIS_TAG ]]; then cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Release .. || exit 2 make -j$(nproc) || exit 3 -# Compile hyperion for cron or PR -else - cmake -DPLATFORM=x86-dev -DCMAKE_BUILD_TYPE=Debug .. || exit 4 +# Compile hyperion for cron +elif [[ $TRAVIS_EVENT_TYPE == 'cron' ]]; then + cmake -DPLATFORM=x86 -DCMAKE_BUILD_TYPE=Debug .. || exit 4 make -j$(nproc) || exit 5 + +# Compile for PR +else + cmake -DPLATFORM=x86-dev -DCMAKE_BUILD_TYPE=Debug .. || exit 6 + make -j$(nproc) || exit 7 fi # Build the package on Linux if [[ $TRAVIS_OS_NAME == 'linux' ]]; then - make -j$(nproc) package || exit 6 + make -j$(nproc) package || exit 8 fi