Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
Baitboat
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
Baitboat
Commits
0b7e96b5
Commit
0b7e96b5
authored
11 years ago
by
Andrew Tridgell
Browse files
Options
Downloads
Patches
Plain Diff
autotest: ensure old tags in PX4NuttX and PX4Firmware don't get used
parent
ab4a5d67
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Tools/scripts/build_autotest.sh
+21
-1
21 additions, 1 deletion
Tools/scripts/build_autotest.sh
with
21 additions
and
1 deletion
Tools/scripts/build_autotest.sh
+
21
−
1
View file @
0b7e96b5
...
@@ -8,10 +8,20 @@ cd $HOME/APM || exit 1
...
@@ -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/
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment