Skip to content

Commit

Permalink
some CI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
fpelliccioni committed Apr 11, 2019
1 parent 88b60c0 commit 8019047
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 18 deletions.
53 changes: 36 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ script:
- git fetch --unshallow
- git fetch origin master:master

# #TODO(fernando): Use lasote/conanclang50 for checking formating and other clang-tools related
# #TODO(fernando): Use conanio/clang50 for checking formating and other clang-tools related
# - |
# if [[ "${CHECK_FORMATTING}" == "true" ]]; then
# cd ${TRAVIS_BUILD_DIR}
# chmod a+x .travis/check_format.sh
# /usr/bin/docker run --rm -ti -v ${TRAVIS_BUILD_DIR}:/home/conan/project \
# -v ${TRAVIS_BUILD_DIR}/.travis/check_format.sh:/tmp/check_format.sh lasote/conanclang40 \
# -v ${TRAVIS_BUILD_DIR}/.travis/check_format.sh:/tmp/check_format.sh conanio/clang40 \
# /bin/bash \
# -c /tmp/check_format.sh

Expand All @@ -98,15 +98,15 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=lasote/conanclang60
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
# if: branch =~ /^(release|hotfix).+$/ #Just releases
if: branch =~ /^(release|hotfix|dev|feature).*$/ #Avoid master
install: skip
script: echo "Running checks (1)"
# - cd ${TRAVIS_BUILD_DIR}
# - chmod a+x .travis/check_format.sh
# - /usr/bin/docker run --rm -ti -v ${TRAVIS_BUILD_DIR}:/home/conan/project \
# -v ${TRAVIS_BUILD_DIR}/.travis/check_format.sh:/tmp/check_format.sh lasote/conanclang60 \
# -v ${TRAVIS_BUILD_DIR}/.travis/check_format.sh:/tmp/check_format.sh conanio/clang60 \
# /bin/bash \
# -c /tmp/check_format.sh

Expand All @@ -119,7 +119,7 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=lasote/conangcc8
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
if: branch =~ /^(release|hotfix).+$/ #Just releases

- stage: build and upload binaries
Expand All @@ -129,7 +129,7 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=lasote/conangcc7
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
BITPRIM_RUN_TESTS=true
if: branch =~ /^(release|hotfix|dev|feature).*$/ #Avoid master

Expand All @@ -140,7 +140,7 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=lasote/conangcc6
env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
if: branch =~ /^(release|hotfix).+$/ #Just releases

- stage: build and upload binaries
Expand All @@ -150,7 +150,7 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=lasote/conangcc5
env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
if: branch =~ /^(release|hotfix).+$/ #Just releases


Expand All @@ -161,7 +161,7 @@ jobs:
# python: "3.6"
# services:
# - docker
# env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49
# env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
# if: branch =~ /^(release|hotfix).+$/ #Just releases


Expand All @@ -173,7 +173,7 @@ jobs:
python: "3.6"
services:
- docker
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=lasote/conanclang60
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
if: branch =~ /^(release|hotfix|dev|feature).*$/ #Avoid master

# - stage: build and upload binaries
Expand All @@ -183,7 +183,7 @@ jobs:
# python: "3.6"
# services:
# - docker
# env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=lasote/conanclang50
# env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
# if: branch =~ /^(release|hotfix).+$/ #Just releases

# - stage: build and upload binaries
Expand All @@ -193,7 +193,7 @@ jobs:
# python: "3.6"
# services:
# - docker
# env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40
# env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
# if: branch =~ /^(release|hotfix).+$/ #Just releases

# - stage: build and upload binaries
Expand All @@ -203,23 +203,42 @@ jobs:
# python: "3.6"
# services:
# - docker
# env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39
# env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39

# macOS, apple-Clang, libc++ -------------------------------------------------
- stage: build and upload binaries
os: osx
language: generic
osx_image: xcode9.3
env: CONAN_APPLE_CLANG_VERSIONS=9.1
osx_image: xcode10.1
env: CONAN_APPLE_CLANG_VERSIONS=10.0
BITPRIM_RUN_TESTS=true
if: branch =~ /^(release|hotfix).+$/ #Just releases
- stage: build and upload binaries
os: osx
language: generic
osx_image: xcode9.3
env: CONAN_APPLE_CLANG_VERSIONS=9.1
osx_image: xcode10.1
env: CONAN_APPLE_CLANG_VERSIONS=10.0
if: branch =~ /^(feature|dev).*$/ #Just development


# - stage: build and upload binaries
# os: osx
# language: generic
# osx_image: xcode9.3
# env: CONAN_APPLE_CLANG_VERSIONS=9.1
# BITPRIM_RUN_TESTS=true
# if: branch =~ /^(release|hotfix).+$/ #Just releases
# - stage: build and upload binaries
# os: osx
# language: generic
# osx_image: xcode9.3
# env: CONAN_APPLE_CLANG_VERSIONS=9.1
# if: branch =~ /^(feature|dev).*$/ #Just development





# - stage: build and upload binaries
# os: osx
# language: generic
Expand Down
2 changes: 1 addition & 1 deletion ci_utils

0 comments on commit 8019047

Please sign in to comment.