Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
93d4f487
Commit
93d4f487
authored
8 years ago
by
Daniel Agar
Browse files
Options
Downloads
Patches
Plain Diff
travis-ci update to latest docker
parent
f8e291da
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+9
-7
9 additions, 7 deletions
.travis.yml
Tools/docker_run.sh
+1
-1
1 addition, 1 deletion
Tools/docker_run.sh
with
10 additions
and
8 deletions
.travis.yml
+
9
−
7
View file @
93d4f487
...
...
@@ -56,16 +56,18 @@ env:
-
secure
:
"
h6oajlW68dWIr+wZhO58Dv6e68dZHrBLVA6lPXZmheFQBW6Xam1HuLGA0LOW6cL9TnrAsOZ8g4goB58eMQnMEijFZKi3mhRwZhd/Xjq/ZGJOWBUrLoQHZUw2dQk5ja5vmUlKEoQnFZjDuMjx8KfX5ZMNy8A3yssWZtJYHD8c+bk="
script
:
-
if [[ "${BUILD_TARGET}" = "qgc_firmware" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
-
if [[ "${TRAVIS_BRANCH}" == "coverity" ]]; then
echo "no script for coverity build";
elif [[ "${BUILD_TARGET}" = "qgc_firmware" ]]; then
./Tools/docker_run.sh 'make qgc_firmware';
elif [[ "${BUILD_TARGET}" = "check_format"
&& "${TRAVIS_BRANCH}" != "coverity"
]]; then
elif [[ "${BUILD_TARGET}" = "check_format" ]]; then
./Tools/docker_run.sh 'make check_format';
elif [[ "${BUILD_TARGET}" = "tests_linux"
&& "${TRAVIS_BRANCH}" != "coverity"
]]; then
elif [[ "${BUILD_TARGET}" = "tests_linux" ]]; then
./Tools/docker_run.sh 'make tests';
elif [[ "${BUILD_TARGET}" = "
clang-tidy" && "${TRAVIS_BRANCH}" != "coverity
" ]]; then
PX4_DOCKER_REPO=px4io/px4-dev-clang
./Tools/docker_run.sh 'make
clang-tidy-parallel
';
elif [[ "${BUILD_TARGET}" = "
parameters_markdown" && "${TRAVIS_BRANCH}" != "coverit
y" ]]; then
PX4_DOCKER_REPO=px4io/px4-dev-
base
./Tools/docker_run.sh 'make
parameters_markdown
';
elif [[ "${BUILD_TARGET}" = "
parameters_markdown
" ]]; then
./Tools/docker_run.sh 'make
parameters_markdown
';
elif [[ "${BUILD_TARGET}" = "
clang-tid
y" ]]; then
PX4_DOCKER_REPO=px4io/px4-dev-
clang:2017-04-22
./Tools/docker_run.sh 'make
clang-tidy-parallel
';
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
make tests;
fi
...
...
This diff is collapsed.
Click to expand it.
Tools/docker_run.sh
+
1
−
1
View file @
93d4f487
#! /bin/bash
if
[
-z
"
$PX4_DOCKER_REPO
"
]
;
then
PX4_DOCKER_REPO
=
px4io/px4-dev-nuttx:2017-0
1
-2
8
PX4_DOCKER_REPO
=
px4io/px4-dev-nuttx:2017-0
4
-2
2
fi
PWD
=
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
...
...
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