Skip to content

Commit

Permalink
Merge pull request #101 from plone/fix-travis
Browse files Browse the repository at this point in the history
Fix the travis build
  • Loading branch information
jensens authored Feb 7, 2019
2 parents c542213 + 2c6ad4b commit 3a7d3e7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
dist: xenial
language: python
python: 2.7
sudo: false
addons:
sauce_connect:
username: $SAUCE_USERNAME
access_key: $SAUCE_ACCESS_KEY
sauce_connect: true
cache:
pip: true
directories:
Expand All @@ -19,6 +18,7 @@ env:
- ARTIFACTS_S3_BUCKET=plone.app.robotframework
- ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
- ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
- ZSERVER_PORT=55001
matrix:
- ROBOT_BROWSER=firefox ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
- ROBOT_BROWSER=chrome ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ New features:

Bug fixes:

- Fix the travis build which is broken since we are picking a random port
(fixes #100)
[ale-rt]

- Remove five.globalrequest dependency.
It has been deprecated upstream (Zope 4).
[gforcada]
Expand Down

0 comments on commit 3a7d3e7

Please sign in to comment.