You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2019/10/22 07:52:00 UTC
[qpid-dispatch] branch master updated (df979c7 -> 2fd4d23)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git.
from df979c7 DISPATCH-1408 - Added prints for count of messages received in third router
new 6182254 DISPATCH-1363 - Move RAT licence check from travis builds into a sub build
new 2fd4d23 NO-JIRA - Fix unittest2 package name in comment
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 29 ++++++++++++++++++-----------
CMakeLists.txt | 4 ++--
2 files changed, 20 insertions(+), 13 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-dispatch] 01/02: DISPATCH-1363 - Move RAT licence check from
travis builds into a sub build
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 61822541e1ead0b3354efa11228b8e13aeaf8f69
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Thu Oct 17 14:23:25 2019 +0200
DISPATCH-1363 - Move RAT licence check from travis builds into a sub build
---
.travis.yml | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f7d0170..54335c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
@@ -61,8 +78,6 @@ addons:
- python2.7-dev
- sasl2-bin
- swig
- # For apache RAT tool
- - maven
# documentation
- asciidoc
- asciidoctor
@@ -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/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-dispatch] 02/02: NO-JIRA - Fix unittest2 package name in
comment
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 2fd4d23659e01696b132ceca2449a3d888616a86
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Mon Oct 21 16:58:04 2019 +0200
NO-JIRA - Fix unittest2 package name in comment
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f4f4c1..edfb3ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org