Browse Source

travis-ci, circleci update to GCC 4.9 and 5.4

sbg
Daniel Agar 9 years ago
parent
commit
c200ef88ed
  1. 6
      .travis.yml
  2. 4
      circle.yml

6
.travis.yml

@ -11,7 +11,7 @@ matrix:
include: include:
- os: linux - os: linux
sudo: required sudo: required
env: GCC_VER=4.8 DOCKER_REPO="px4io/px4-dev-base:2016-10-09" env: GCC_VER=4.9 DOCKER_REPO="px4io/px4-dev-base:2016-10-20"
services: services:
- docker - docker
- os: osx - os: osx
@ -77,7 +77,7 @@ after_success:
&& find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4 && find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4
&& mkdir s3deploy-branch && mv *_default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/; && mkdir s3deploy-branch && mv *_default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/;
fi fi
- if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "4.8" ]]; then - if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "4.9" ]]; then
export PX4_S3_DEPLOY=1; export PX4_S3_DEPLOY=1;
fi fi
@ -120,7 +120,7 @@ deploy:
tags: true tags: true
all_branches: true all_branches: true
repo: PX4/Firmware repo: PX4/Firmware
condition: $GCC_VER = 4.8 condition: $GCC_VER = 4.9
notifications: notifications:
webhooks: webhooks:

4
circle.yml

@ -12,11 +12,11 @@ checkout:
dependencies: dependencies:
pre: pre:
- docker pull px4io/px4-dev-nuttx-gcc4.9:2016-10-09 - docker pull px4io/px4-dev-nuttx-gcc_next:2016-10-20
test: test:
override: override:
- docker run --rm -v `pwd`:`pwd`:rw -e CI=true -w=`pwd` --user=$UID -it px4io/px4-dev-nuttx-gcc4.9 /bin/bash -c "make quick_check" - docker run --rm -v `pwd`:`pwd`:rw -e CI=true -w=`pwd` --user=$UID -it px4io/px4-dev-nuttx-gcc_next:2016-10-20 /bin/bash -c "make quick_check"
general: general:
artifacts: artifacts:

Loading…
Cancel
Save