diff options
| author | Pierre GRANDIN <grandinp@altern.org> | 2015-08-25 12:47:59 -0700 |
|---|---|---|
| committer | Pierre GRANDIN <grandinp@altern.org> | 2015-08-25 12:47:59 -0700 |
| commit | 5271fac7faacaaf6e52e1391e21f06f7b88eb49e (patch) | |
| tree | 9d913da069cf84bbc6373ae6dcd3f0b2ae309e49 | |
| parent | bb1b6f4f65d45e09375c687b124beaee4d6540d3 (diff) | |
| download | navit-5271fac7faacaaf6e52e1391e21f06f7b88eb49e.tar.gz | |
Renamed linux build script for consistency, only build for coverity from trunk
| -rw-r--r-- | ci/build.sh | 14 | ||||
| -rw-r--r-- | ci/build_linux.sh | 20 | ||||
| -rw-r--r-- | circle.yml | 2 |
3 files changed, 21 insertions, 15 deletions
diff --git a/ci/build.sh b/ci/build.sh deleted file mode 100644 index 229f57f25..000000000 --- a/ci/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz -export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH - -mkdir bin && cd bin -cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -cov-build --dir cov-int make || exit -1 -tar czvf navit.tgz cov-int - -curl --form token=$COVERITY_TOKEN \ - --form email=$COVERITY_EMAIL \ - --form file=@navit.tgz \ - --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ - --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ - https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME diff --git a/ci/build_linux.sh b/ci/build_linux.sh new file mode 100644 index 000000000..5589d71eb --- /dev/null +++ b/ci/build_linux.sh @@ -0,0 +1,20 @@ +if [[ "${CIRCLE_BRANCH}" == "trunk" ]]; then + tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz + export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH + + mkdir bin && cd bin + cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE + cov-build --dir cov-int make || exit -1 + tar czvf navit.tgz cov-int + + curl --form token=$COVERITY_TOKEN \ + --form email=$COVERITY_EMAIL \ + --form file=@navit.tgz \ + --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ + --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ + https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME +else + mkdir bin && cd bin + cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE || exit -1 + make || exit -1 +fi diff --git a/circle.yml b/circle.yml index 741864643..e51f766bb 100644 --- a/circle.yml +++ b/circle.yml @@ -25,7 +25,7 @@ dependencies: - sudo apt-get install libdbus-glib-1-dev - sudo apt-get install g++ - bash ci/import_translations.sh - - bash ci/build.sh + - bash ci/build_linux.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/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=@bin/po/navit.pot | grep title" |