From 0d9a3840d8b93941b6a8ff865bc1a8929ec21acc Mon Sep 17 00:00:00 2001 From: Grant Morphett Date: Sun, 6 Mar 2016 13:41:50 +1100 Subject: [PATCH] autotest: Added submodule update and removed old modules update Firstly build.All was failing as the submodules had not been updated so the 'git submodule update' in this commit resovles that. Secondly, now that the dependant projects like PX4Firmware etc are git submodules of ardupilot we no longer need to check them out separately and update them so I have removed all those. I left MAVProxy as it isn't a submodule of ardupilot. --- Tools/scripts/build_autotest.sh | 35 ++------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/Tools/scripts/build_autotest.sh b/Tools/scripts/build_autotest.sh index b102258f6f..261428c0ab 100755 --- a/Tools/scripts/build_autotest.sh +++ b/Tools/scripts/build_autotest.sh @@ -87,9 +87,11 @@ report_pull_failure() { oldhash=$(cd APM && git rev-parse HEAD) +echo "Updating APM" pushd APM git checkout -f master git fetch origin +git submodule update git reset --hard origin/master git pull || report_pull_failure git clean -f -f -x -d -d @@ -99,39 +101,6 @@ popd rsync -a APM/Tools/autotest/web-firmware/ buildlogs/binaries/ -pushd PX4Firmware -git fetch origin -git reset --hard origin/master -for v in ArduPlane ArduCopter APMrover2; do - git tag -d $v-beta || true - git tag -d $v-stable || true -done -git fetch origin --tags -git show -popd - -pushd PX4NuttX -git fetch origin -git reset --hard origin/master -for v in ArduPlane ArduCopter APMrover2; do - git tag -d $v-beta || true - git tag -d $v-stable || true -done -git fetch origin --tags -git show -popd - -pushd uavcan -git fetch origin -git reset --hard origin/master -for v in ArduPlane ArduCopter APMrover2; do - git tag -d $v-beta || true - git tag -d $v-stable || true -done -git fetch origin --tags -git show -popd - echo "Updating pymavlink" pushd mavlink/pymavlink git fetch origin