From 55537a447a1f0c9672563ce54e65df15d3faa188 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Tue, 25 Jun 2019 18:39:15 +1000 Subject: [PATCH] Fix incorrect cppcheck path --- .travis.yml | 4 ++-- misra/check_misra_github.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84c52393..4efd9bc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,8 +66,8 @@ script: # Run the builds - platformio run -e megaatmega2560 -e teensy35 # Upload ini and hex files to speeduino.com server - - curl -v --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pioenvs/megaatmega2560/firmware.hex" "https://speeduino.com:2078/bin/master.hex" - - curl -v --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./reference/speeduino.ini" "https://speeduino.com:2078/master.ini" + - curl --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pioenvs/megaatmega2560/firmware.hex" "https://speeduino.com:2078/bin/master.hex" + - curl --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./reference/speeduino.ini" "https://speeduino.com:2078/master.ini" # Begin MISRA scan - cd .. - chmod +x speeduino/misra/check_misra_github.sh diff --git a/misra/check_misra_github.sh b/misra/check_misra_github.sh index b02035bb..418121f6 100755 --- a/misra/check_misra_github.sh +++ b/misra/check_misra_github.sh @@ -1,7 +1,8 @@ #!/bin/bash cppcheck_path=cppcheck_github/ -cppcheck_bin="${cppcheck_path}cppcheck" +#cppcheck_bin="${cppcheck_path}cppcheck" +cppcheck_bin="cppcheck" cppcheck_misra="${cppcheck_path}addons/misra.py" if [ -f ./results.txt ]; then