Browse Source

fix pushing nightly builds by travis; use coverity on 0.2 branch

Julius Pfrommer 7 years ago
parent
commit
70ca2b0a2e
2 changed files with 7 additions and 14 deletions
  1. 6 13
      tools/travis/travis_linux_after_success.sh
  2. 1 1
      tools/travis/travis_push_release.sh

+ 6 - 13
tools/travis/travis_linux_after_success.sh

@@ -3,24 +3,17 @@ set -ev
 
 if [ $ANALYZE = "true" ]; then
     echo "=== Skipping after_success scripts in ANALYZE mode ==="
-
 else
     echo "=== Executing after_success scripts ==="
-
     if [ "$CC" = "gcc" ] && [ "${TRAVIS_REPO_SLUG}" = "open62541/open62541" ]; then
-        if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
-            if [ ${TRAVIS_BRANCH} = "0.2" ]; then
-                sh ./tools/travis/travis_push_doc.sh
-            fi
-            if [ ${TRAVIS_BRANCH} = "master" ]; then
-                sh ./tools/travis/travis_push_coverity.sh
-            fi
-        else
-           echo "  Skipping push doc/coverity on pull requests"
+        if [ ${TRAVIS_BRANCH} = "0.2" ]; then
+            sh ./tools/travis/travis_push_doc.sh
+        fi
+        if [ ${TRAVIS_BRANCH} = "0.2" ]; then
+            sh ./tools/travis/travis_push_coverity.sh
         fi
-
         sh ./tools/travis/travis_push_release.sh;
     else
         echo "  Skipping push scripts since not gcc and/or ${TRAVIS_REPO_SLUG} is not the main repo"
     fi
-fi
+fi

+ 1 - 1
tools/travis/travis_push_release.sh

@@ -34,7 +34,7 @@ if [ ! -e "$TAG.zip" ]; then
 
     LINETOSTART=$((TAGSTOSAVE+1))
     #remove obsolete zips
-    tail -n +"$LINETOSTART" raw.txt | xargs git rm
+    tail -n +"$LINETOSTART" raw.txt | xargs git rm --ignore-unmatch
 
     #remove obsolete zips from list
     head "-$TAGSTOSAVE" raw.txt > temp && mv temp raw.txt