From 2fd646b35bb15da0ae00071a600dec7fd232a6eb Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 14:51:24 +0100 Subject: [PATCH 1/6] add coverity_scan. --- .travis.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba41d455c..c21cb2710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,9 @@ before_install: - if [ "${TRAVIS_OS_NAME}" != "windows" ]; then make --version; fi + - if [ "${RUN_COVERALLS}" = "TRUE" ]; then + echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- + fi script: - cmake --version - gcc --version @@ -100,11 +103,21 @@ matrix: compiler: - g++-6 env: + global: + - secure: "YTmhefHriemOMr0IKcuWIBRAW+mKskIID4JCq6W6cBYbxl6tazyNqjaHyawPxwSZEtRmoSsF5rI8xDaU4bYoJl0kc12svgHCHCbd0cFsE+b33VQ6sAcxfVvnFvHcr4ZQN5WvI5SF/9/yv/6BXUJeaCKWkiXHH4921XLmaohYDVMykQ9LU6TXI5Q/KAxor8shyRfGRSEA7sAGqWuoRh3QfJSllWM+61Gjr5AsX7lJnp+5zXRvqPs4453T0MkoaqugZh2ourOJRTgLQ+zVPpiBgWSkSTKx318RfCm5bYMRQNLssX043TxUtU9nNVOgTLiaTIeFgyaZ3A/bSQ9EsLN7SxvrleXYXLFpIch3h0/cqQYacfd8HlA3eFZNa18AWmAc7B8UonvuAfQ+EsIAx1nL7vK24urkR/MDB3pv5ytZF0u9p1CvRSZ1GiPPUD91FHB+i7oSV56m4rD5e2EYtWQyZXDuI9jPTHJaPkX//YSdByzV00Jk0ir2aHDgr5UoOMmE37vnWg5z1FRALW7fNao7cR9PINJdwOXqXUjhApf0ShCHNGjmtoej4yxZE6VsLc8TZOERI1qg32HDJdZX5e+ySjtO8fcIuLX8zJwvnKV4mpvOmH1h6YxfqRhImVhuBTEwuhFOn089m8v1j7ZvYpPGTfJGBKHIE7MQV4Ojbduf3vY=" - MAKE_FILE_GENERATOR="Unix Makefiles" - CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DCMAKE_BUILD_TYPE=Coverage" - RUN_COVERALLS="TRUE" - MATRIX_EVAL="sudo apt install python-setuptools && CC=gcc-6 && CXX=g++-6 && FC=gfortran && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-6 --slave /usr/bin/gcov gcov /usr/bin/gcov-6 && sudo update-alternatives --config gcc && gcc --version && gcov --version && gfortran --version && mkdir astyle && cd astyle && wget 'https://sourceforge.net/projects/astyle/files/astyle/astyle 2.04/astyle_2.04_linux.tar.gz' && tar -zxvf astyle_2.04_linux.tar.gz && cd astyle/build/gcc && make && sudo make install && cd ../../../../ && pip install --user cpp-coveralls" # && export PYTHONPATH=$PYTHONPATH:$TRAVIS_BUILD_DIR/build/lib" addons: + coverity_scan: + project: + name: "GeodynamicWorldBuilder/WorldBuilder" + description: "An initial conditions generator for geodynamic models." + notification_email: geodynamicworldbuilder@outlook.com + build_command_prepend: "cmake ." + build_command: "make" + branch_pattern: coverity_scan apt: sources: - ubuntu-toolchain-r-test @@ -274,4 +287,4 @@ matrix: packages: - gfortran - swig - - python3-setuptools \ No newline at end of file + - python3-setuptools From d9dfa969edabc85ceb3b216c26dbccdee3297eac Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 14:55:59 +0100 Subject: [PATCH 2/6] fixup --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c21cb2710..d243ea00f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,13 +111,13 @@ matrix: - MATRIX_EVAL="sudo apt install python-setuptools && CC=gcc-6 && CXX=g++-6 && FC=gfortran && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-6 --slave /usr/bin/gcov gcov /usr/bin/gcov-6 && sudo update-alternatives --config gcc && gcc --version && gcov --version && gfortran --version && mkdir astyle && cd astyle && wget 'https://sourceforge.net/projects/astyle/files/astyle/astyle 2.04/astyle_2.04_linux.tar.gz' && tar -zxvf astyle_2.04_linux.tar.gz && cd astyle/build/gcc && make && sudo make install && cd ../../../../ && pip install --user cpp-coveralls" # && export PYTHONPATH=$PYTHONPATH:$TRAVIS_BUILD_DIR/build/lib" addons: coverity_scan: - project: - name: "GeodynamicWorldBuilder/WorldBuilder" - description: "An initial conditions generator for geodynamic models." - notification_email: geodynamicworldbuilder@outlook.com - build_command_prepend: "cmake ." - build_command: "make" - branch_pattern: coverity_scan + project: + name: "GeodynamicWorldBuilder/WorldBuilder" + description: "An initial conditions generator for geodynamic models." + notification_email: geodynamicworldbuilder@outlook.com + build_command_prepend: "cmake ." + build_command: "make" + branch_pattern: coverity_scan apt: sources: - ubuntu-toolchain-r-test From 7383da615e45c5f97bdecd4616be1a3e510f938a Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 14:59:39 +0100 Subject: [PATCH 3/6] fixup --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d243ea00f..671ab9d0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: cpp sudo: true +env: + global: + - secure: "YTmhefHriemOMr0IKcuWIBRAW+mKskIID4JCq6W6cBYbxl6tazyNqjaHyawPxwSZEtRmoSsF5rI8xDaU4bYoJl0kc12svgHCHCbd0cFsE+b33VQ6sAcxfVvnFvHcr4ZQN5WvI5SF/9/yv/6BXUJeaCKWkiXHH4921XLmaohYDVMykQ9LU6TXI5Q/KAxor8shyRfGRSEA7sAGqWuoRh3QfJSllWM+61Gjr5AsX7lJnp+5zXRvqPs4453T0MkoaqugZh2ourOJRTgLQ+zVPpiBgWSkSTKx318RfCm5bYMRQNLssX043TxUtU9nNVOgTLiaTIeFgyaZ3A/bSQ9EsLN7SxvrleXYXLFpIch3h0/cqQYacfd8HlA3eFZNa18AWmAc7B8UonvuAfQ+EsIAx1nL7vK24urkR/MDB3pv5ytZF0u9p1CvRSZ1GiPPUD91FHB+i7oSV56m4rD5e2EYtWQyZXDuI9jPTHJaPkX//YSdByzV00Jk0ir2aHDgr5UoOMmE37vnWg5z1FRALW7fNao7cR9PINJdwOXqXUjhApf0ShCHNGjmtoej4yxZE6VsLc8TZOERI1qg32HDJdZX5e+ySjtO8fcIuLX8zJwvnKV4mpvOmH1h6YxfqRhImVhuBTEwuhFOn089m8v1j7ZvYpPGTfJGBKHIE7MQV4Ojbduf3vY=" + before_install: - echo ${CMAKE_EXTRA_ARGS} - echo ${MATRIX_EVAL} @@ -103,8 +107,6 @@ matrix: compiler: - g++-6 env: - global: - - secure: "YTmhefHriemOMr0IKcuWIBRAW+mKskIID4JCq6W6cBYbxl6tazyNqjaHyawPxwSZEtRmoSsF5rI8xDaU4bYoJl0kc12svgHCHCbd0cFsE+b33VQ6sAcxfVvnFvHcr4ZQN5WvI5SF/9/yv/6BXUJeaCKWkiXHH4921XLmaohYDVMykQ9LU6TXI5Q/KAxor8shyRfGRSEA7sAGqWuoRh3QfJSllWM+61Gjr5AsX7lJnp+5zXRvqPs4453T0MkoaqugZh2ourOJRTgLQ+zVPpiBgWSkSTKx318RfCm5bYMRQNLssX043TxUtU9nNVOgTLiaTIeFgyaZ3A/bSQ9EsLN7SxvrleXYXLFpIch3h0/cqQYacfd8HlA3eFZNa18AWmAc7B8UonvuAfQ+EsIAx1nL7vK24urkR/MDB3pv5ytZF0u9p1CvRSZ1GiPPUD91FHB+i7oSV56m4rD5e2EYtWQyZXDuI9jPTHJaPkX//YSdByzV00Jk0ir2aHDgr5UoOMmE37vnWg5z1FRALW7fNao7cR9PINJdwOXqXUjhApf0ShCHNGjmtoej4yxZE6VsLc8TZOERI1qg32HDJdZX5e+ySjtO8fcIuLX8zJwvnKV4mpvOmH1h6YxfqRhImVhuBTEwuhFOn089m8v1j7ZvYpPGTfJGBKHIE7MQV4Ojbduf3vY=" - MAKE_FILE_GENERATOR="Unix Makefiles" - CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DCMAKE_BUILD_TYPE=Coverage" - RUN_COVERALLS="TRUE" From 0e0b2aba232e48dc65251ee801bad30f63a94b2d Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 15:02:56 +0100 Subject: [PATCH 4/6] fixup --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 671ab9d0f..b25b7f0fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,6 @@ before_install: - if [ "${TRAVIS_OS_NAME}" != "windows" ]; then make --version; fi - - if [ "${RUN_COVERALLS}" = "TRUE" ]; then - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- - fi script: - cmake --version - gcc --version From 28dd5f7f1ba72166e02e0b6b484df09013ab03fb Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 15:14:17 +0100 Subject: [PATCH 5/6] fixup --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b25b7f0fd..2d6e8e267 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,9 @@ before_install: - if [ "${TRAVIS_OS_NAME}" != "windows" ]; then make --version; fi + - if [ "${RUN_COVERALLS}" = "TRUE" ]; then + echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; + fi script: - cmake --version - gcc --version From 3e19a96acb15f8c407b7f88b5cf98baffa1acaea Mon Sep 17 00:00:00 2001 From: Menno Fraters Date: Thu, 19 Dec 2019 15:21:20 +0100 Subject: [PATCH 6/6] fixup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d6e8e267..f74d28c32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: make --version; fi - if [ "${RUN_COVERALLS}" = "TRUE" ]; then - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; + 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 script: - cmake --version