diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-04-04 13:27:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 13:27:22 -0700 |
| commit | 835ab9a74f43f0e63fdcaea8bd68c046868aeba5 (patch) | |
| tree | 743849db91a924f6fe5bf7e838d603c7f5b95cb0 | |
| parent | e6a71fd6770c36560cb9d8451ae36cc3c0018ba3 (diff) | |
| download | navit-835ab9a74f43f0e63fdcaea8bd68c046868aeba5.tar.gz | |
Fix coverity builds (#432)
* Download coverity from the official source
* Fixed coverity builds
Running cov-int against make package was producing an empty build result for coverity to scan
* Restored target branch 'trunk'
| -rw-r--r-- | ci/build_linux.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 483128558..f84d247af 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -11,13 +11,16 @@ pushd $BUILD_PATH if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then # If we are building the official trunk code, push an update to coverity - wget --progress=dot:giga -c -O /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz + curl \ + -X POST --data "token=${COVERITY_TOKEN}&project=${CIRCLE_PROJECT_USERNAME}" \ + -o /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz -s \ + https://scan.coverity.com/download/linux64 + tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/ export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH - cov-build --dir cov-int cmake ${cmake_opts} ../ - cov-build --dir cov-int make -j $(nproc --all) || exit -1 - cov-build --dir cov-int make -j $(nproc --all) package || exit -1 + cmake ${cmake_opts} ../ + cov-build --dir cov-int make -j $(nproc --all) tar czvf navit.tgz cov-int curl --form token=$COVERITY_TOKEN \ @@ -27,15 +30,17 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME + make package + # Then update the translation template on launchpad sed -i '/INTEGER/d' po/navit.pot cp po/navit.pot $CIRCLE_ARTIFACTS/ curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@po/navit.pot | grep title else - cmake ${cmake_opts} ../ || exit -1 - make -j $(nproc --all) || exit -1 - make package || exit -1 + cmake ${cmake_opts} ../ + make -j $(nproc --all) + make package fi if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then |