Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

DISPATCH-1363 - Move RAT licence check from travis builds into a sub build #592

Merged
merged 2 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,23 @@ matrix:
allow_failures:
- os: osx
include:
- name: "apache-rat:check"
os: linux
sudo: false
env: []
language: java
addons:
apt:
packages: []
cache:
directories:
- $HOME/.m2/repository
before_cache:
- rm -rf $HOME/.m2/repository/org/apache/qpid/*
install: []
before_script: []
script:
- mvn apache-rat:check
# prepending /usr/bin to PATH to avoid mismatched python interpreters in /opt
- os: linux
env:
Expand Down Expand Up @@ -61,8 +78,6 @@ addons:
- python2.7-dev
- sasl2-bin
- swig
# For apache RAT tool
- maven
# documentation
- asciidoc
- asciidoctor
Expand Down Expand Up @@ -98,15 +113,7 @@ script:
# Workaround on macOS for PROTON-808 Binaries have their library locations stripped
- if [[ "${OSTYPE}" == "darwin"* ]]; then install_name_tool -add_rpath $PREFIX/lib/. $PREFIX/lib/proton/bindings/python/_cproton.so; fi
- ctest -V && if [ "$BUILD_TYPE" = "Coverage" ]; then cmake --build . --target coverage; fi
- popd
- mvn apache-rat:check

after_success:
- pushd build
- cd ${TRAVIS_BUILD_DIR}/build
- if [ "$BUILD_TYPE" = "Coverage" ]; then bash <(curl -s https://codecov.io/bash); fi

cache:
directories:
- $HOME/.m2/repository
before_cache:
- rm -rf $HOME/.m2/repository/org/apache/qpid/*
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ endif()
enable_testing()

# python unittest
# For versions < 2.7 the developer needs to install the python-unittest2
# module (available via 'pip install python-unittest2'
# For versions < 2.7 the developer needs to install the unittest2
# module (available via 'yum install python-unittest2' or 'pip install unittest2'
#
if(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
set(PYTHON_TEST_COMMAND "unit2")
Expand Down