mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
autotest: ensure old tags in PX4NuttX and PX4Firmware don't get used
This commit is contained in:
parent
ab4a5d676e
commit
0b7e96b528
@ -8,10 +8,20 @@ cd $HOME/APM || exit 1
|
|||||||
|
|
||||||
test -n "$FORCEBUILD" || {
|
test -n "$FORCEBUILD" || {
|
||||||
(cd APM && git fetch > /dev/null 2>&1)
|
(cd APM && git fetch > /dev/null 2>&1)
|
||||||
|
|
||||||
newtags=$(cd APM && git fetch --tags | wc -l)
|
newtags=$(cd APM && git fetch --tags | wc -l)
|
||||||
oldhash=$(cd APM && git rev-parse origin/master)
|
oldhash=$(cd APM && git rev-parse origin/master)
|
||||||
newhash=$(cd APM && git rev-parse HEAD)
|
newhash=$(cd APM && git rev-parse HEAD)
|
||||||
if [ "$oldhash" = "$newhash" -a "$newtags" = "0" ]; then
|
|
||||||
|
newtagspx4=$(cd PX4Firmware && git fetch --tags | wc -l)
|
||||||
|
oldhashpx4=$(cd PX4Firmware && git rev-parse origin/master)
|
||||||
|
newhashpx4=$(cd PX4Firmware && git rev-parse HEAD)
|
||||||
|
|
||||||
|
newtagsnuttx=$(cd PX4NuttX && git fetch --tags | wc -l)
|
||||||
|
oldhashnuttx=$(cd PX4NuttX && git rev-parse origin/master)
|
||||||
|
newhashnuttx=$(cd PX4NuttX && git rev-parse HEAD)
|
||||||
|
|
||||||
|
if [ "$oldhash" = "$newhash" -a "$newtags" = "0" -a "$oldhashpx4" = "$newhashpx4" -a "$newtagspx4" = "0" -a "$oldhashnuttx" = "$newhashnuttx" -a "$newtagsnuttx" = "0" ]; then
|
||||||
echo "no change $oldhash $newhash `date`" >> build.log
|
echo "no change $oldhash $newhash `date`" >> build.log
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@ -85,12 +95,22 @@ rsync -a APM/Tools/autotest/web-firmware/ buildlogs/binaries/
|
|||||||
pushd PX4Firmware
|
pushd PX4Firmware
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git reset --hard origin/master
|
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
|
git show
|
||||||
popd
|
popd
|
||||||
|
|
||||||
pushd PX4NuttX
|
pushd PX4NuttX
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git reset --hard origin/master
|
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
|
git show
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user