mirror of https://github.com/ArduPilot/ardupilot
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.
This commit is contained in:
parent
1df7baa5c5
commit
0d9a3840d8
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue