Skip to content

Commit

Permalink
Fixed Travis caching.
Browse files Browse the repository at this point in the history
Downloads do not need to be cached.
And for the eggs we were caching the wrong directory.
Fixes issue #408.
  • Loading branch information
mauritsvanrees committed Sep 18, 2019
1 parent c1c771c commit 4a792eb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Changelog
4.1.4 (unreleased)
------------------

- Fixed Travis caching. Downloads do not need to be cached.
And for the eggs we were caching the wrong directory.
Fixes `issue #408 <https://github.com/plone/bobtemplates.plone/issues/408>`_.
[maurits]

- Fixed name of commented out version behavior.
This is ``plone.versioning`` and not ``plone.versionable``.
[maurits]
Expand Down
8 changes: 0 additions & 8 deletions bobtemplates/plone/addon/.travis.yml.bob
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ cache:
pip: true
directories:
- eggs
- downloads
python:
- "2.7"
matrix:
Expand All @@ -23,14 +22,7 @@ matrix:
before_install:
- sudo apt-get install -y firefox-geckodriver
- virtualenv -p `which python` .
- mkdir -p $HOME/buildout-cache/{eggs,downloads}
- mkdir $HOME/.buildout
- echo "[buildout]" > $HOME/.buildout/default.cfg
- echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
- echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
- bin/pip install -r requirements.txt -c constraints_plone$PLONE_VERSION.txt
# - bin/buildout -N out:download-cache=downloads code-analysis:return-status-codes=True annotate
# - bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True
- cp test_plone$PLONE_VERSION.cfg buildout.cfg

install:
Expand Down
6 changes: 3 additions & 3 deletions bobtemplates/plone/theme_package/.travis.yml.bob
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
dist: bionic
language: python
sudo: false
cache:
pip: true
directories:
- eggs
- downloads
python:
- "2.7"
matrix:
fast_finish: true
install:
- virtualenv -p `which python` .
- bin/pip install -r requirements.txt
- bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
- bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True
- bin/buildout -N code-analysis:return-status-codes=True annotate
- bin/buildout -N code-analysis:return-status-codes=True
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
Expand Down

0 comments on commit 4a792eb

Please sign in to comment.