From f7a7e57807819619be7e674e065d11cb5a4e81cc Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 12:03:09 +0200 Subject: [PATCH 1/7] travis: check if cmake is installed with brew. --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 661de2279..918f6ad9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,14 @@ language: cpp before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake python3 homebrew/x11/freeglut; fi + - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then + if brew ls versions cmake > /dev/null/ then + else + brew install cmake + fi + brew install python3 + brew install homebrew/x11/freeglut; + fi' - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h # install latest LCOV (1.9 was failing) - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ${TRAVIS_BUILD_DIR} && wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz && tar xf lcov_1.11.orig.tar.gz && sudo make -C lcov-1.11/ install && gem install coveralls-lcov && lcov --version && g++ --version ; fi From 91f888a254821bb2e878c7e765e45b7427b5bbbc Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 12:36:10 +0200 Subject: [PATCH 2/7] travis: add missing semicolons. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 918f6ad9c..961104395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ before_install: - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then if brew ls versions cmake > /dev/null/ then else - brew install cmake + brew install cmake; fi - brew install python3 + brew install python3; brew install homebrew/x11/freeglut; fi' - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h From 11e9173a094f7810bcf17554b2c1b048607e4663 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 13:21:31 +0200 Subject: [PATCH 3/7] travis: add missing semicolon in if-then statement. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 961104395..452c14121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if brew ls versions cmake > /dev/null/ then + if brew ls versions cmake > /dev/null/; then else brew install cmake; fi From e7afc8baf35d5255907b669a73ee40192f514780 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 14:37:42 +0200 Subject: [PATCH 4/7] travis: add next missing selicolon. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 452c14121..28fc680f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,11 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then if brew ls versions cmake > /dev/null/; then - else + echo cmake already installed.; + else brew install cmake; - fi - brew install python3; + fi + brew install python3; brew install homebrew/x11/freeglut; fi' - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h From 501f09307ce69b849063cd3615e19498465eda94 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 18:55:25 +0200 Subject: [PATCH 5/7] travis: fix brew ls command. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28fc680f7..071da1a49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if brew ls versions cmake > /dev/null/; then + if brew ls --versions cmake > /dev/null/; then echo cmake already installed.; else brew install cmake; From e94bbe7e0a19d2a75224df71aba06d379fc6c437 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 18:58:55 +0200 Subject: [PATCH 6/7] travis: fix dev/null access. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 071da1a49..e43e3a12d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if brew ls --versions cmake > /dev/null/; then + if brew ls --versions cmake > /dev/null; then echo cmake already installed.; else brew install cmake; From d150874f068f132d13c098eb72d78afc5a5cdc1b Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 21 Jul 2017 19:10:32 +0200 Subject: [PATCH 7/7] travis: next try. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e43e3a12d..ffebab3cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: echo cmake already installed.; else brew install cmake; - fi + fi; brew install python3; brew install homebrew/x11/freeglut; fi'