From 428f0075fb03ea4271f139ae695eed84654af2af Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Sat, 20 Jan 2018 00:26:25 +0100 Subject: [PATCH 1/2] CI Travis OSX: bump pycapnp to requirements.txt version --- ci/travis/before_install-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/travis/before_install-osx.sh b/ci/travis/before_install-osx.sh index de632005db..420d35acaf 100755 --- a/ci/travis/before_install-osx.sh +++ b/ci/travis/before_install-osx.sh @@ -44,4 +44,4 @@ python get-pip.py --user pip setuptools wheel echo "Installing Python dependencies" pip install --use-wheel --user -r bindings/py/requirements.txt --quiet || exit -pip install pycapnp==0.5.8 --user || exit +pip install pycapnp==0.5.12 --user || exit From b59c99074f99960cee9cca83d3e6bbb65727bdff Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Sat, 20 Jan 2018 00:27:25 +0100 Subject: [PATCH 2/2] CI Travis: enable OSX and Linux builds --- .travis.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a79e16fc7..7c2347890d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,11 @@ osx_image: xcode6.4 os: - osx + - linux compiler: - clang + - gcc env: global: @@ -17,9 +19,9 @@ env: - PLATFORM=${TRAVIS_OS_NAME} - ARCHFLAGS="-arch x86_64" # AWS keys are for manual uploads of wheel to S3. - - AWS_ACCESS_KEY_ID=AKIAIGHYSEHV3WFKOWNQ +# - AWS_ACCESS_KEY_ID=AKIAIGHYSEHV3WFKOWNQ # AWS_SECRET_ACCESS_KEY encrypted below - - secure: "Ixm9TYZAZbCQicUTIZTY7XKNK82WF+f1jsaGtIxnGQmn0LKhKBjQnsZmhzQ7LDQeLUjRY3wM6xrX3YdP5T7WWiiqBiNCRz8oFxl/fBSm7LyuNo2CEGD9rsG6ZAY/sKKYNX5TuG78giJXwYZpq4LbVwy3W5ZlC626H7iXLQ6xDxw=" +# - secure: "Ixm9TYZAZbCQicUTIZTY7XKNK82WF+f1jsaGtIxnGQmn0LKhKBjQnsZmhzQ7LDQeLUjRY3wM6xrX3YdP5T7WWiiqBiNCRz8oFxl/fBSm7LyuNo2CEGD9rsG6ZAY/sKKYNX5TuG78giJXwYZpq4LbVwy3W5ZlC626H7iXLQ6xDxw=" virtualenv: system_site_packages: true @@ -39,9 +41,9 @@ before_deploy: deploy: provider: s3 - access_key_id: AKIAIGHYSEHV3WFKOWNQ +# access_key_id: AKIAIGHYSEHV3WFKOWNQ secret_access_key: - secure: YhyY/6r2LNya8OZEmVOj+fv0lY5bBPqvy8MnsdLlptXa2uqwvezkCMNKiQ+wA+tOu+BS7VRRp86DhUqCpTZ3jUM2Mwdhud/Smq7D2X8vtZBiTVcOKfQcaypDE6Zu9Zp0SjMOSf6yiq6Ruu7D5QtZ4rtaq+5uPlvbgUXRZoZm0Po= +# secure: YhyY/6r2LNya8OZEmVOj+fv0lY5bBPqvy8MnsdLlptXa2uqwvezkCMNKiQ+wA+tOu+BS7VRRp86DhUqCpTZ3jUM2Mwdhud/Smq7D2X8vtZBiTVcOKfQcaypDE6Zu9Zp0SjMOSf6yiq6Ruu7D5QtZ4rtaq+5uPlvbgUXRZoZm0Po= bucket: artifacts.numenta.org region: us-west-2 local-dir: "$TRAVIS_BUILD_DIR/release" @@ -55,8 +57,8 @@ deploy: notifications: email: - recipients: - - "discourse-nupic-developers@numenta.org" +# recipients: +# - "discourse-nupic-developers@numenta.org" on_success: never on_failure: change irc: @@ -64,8 +66,8 @@ notifications: - "irc.freenode.net#nupic-hackers" webhooks: - urls: - - https://webhooks.gitter.im/e/68f77bae61efa5c931f8 - - https://api.keen.io/3.0/projects/5555161e2fd4b1326f14444a/events/travis-webhooks?api_key=a2e613bbb19b9b1f71a5543b7b677563551b4c3fe98534269546ff666ae453f82505791772faefc48682ee882ac7e99d2c3bfae7c7c19db7b5e7bbda34039119e4b42f5bf41bcea62d4ea9731db4a455141be7d5e8c715cb06366922eae0358e84abc2704ce16bb77b01fec3476cbac6 +# - https://webhooks.gitter.im/e/68f77bae61efa5c931f8 +# - https://api.keen.io/3.0/projects/5555161e2fd4b1326f14444a/events/travis-webhooks?api_key=a2e613bbb19b9b1f71a5543b7b677563551b4c3fe98534269546ff666ae453f82505791772faefc48682ee882ac7e99d2c3bfae7c7c19db7b5e7bbda34039119e4b42f5bf41bcea62d4ea9731db4a455141be7d5e8c715cb06366922eae0358e84abc2704ce16bb77b01fec3476cbac6 before_install: - ". ./ci/travis/before_install-osx.sh" @@ -76,7 +78,7 @@ install: - "mkdir -p $TRAVIS_BUILD_DIR/build/release" - "cmake --version" # Enable test coverage for travis-ci build - - "cmake $TRAVIS_BUILD_DIR -DNTA_COV_ENABLED=ON -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/build/release -DPY_EXTENSIONS_DIR=$TRAVIS_BUILD_DIR/bindings/py/src/nupic/bindings" + - "cmake $TRAVIS_BUILD_DIR -DCMAKE_BUILD_TYPE=Release -DNTA_COV_ENABLED=ON -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/build/release -DPY_EXTENSIONS_DIR=$TRAVIS_BUILD_DIR/bindings/py/src/nupic/bindings" # Configure bash such that a failure in any link in the pipe causes the whole pipe to fail - "set -o pipefail" - "VERBOSE=1 make|grep -v -F '\\-\\- Installing:'"