Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Rename travis.cfg to ci.cfg #95

Closed
wants to merge 1 commit into from
Closed

Rename travis.cfg to ci.cfg #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ before_install:
- virtualenv .
- bin/pip install --upgrade pip setuptools zc.buildout
install:
- bin/buildout -N -t 3 -c travis.cfg
- bin/buildout -N -t 3 -c ci.cfg

env:
matrix:
Expand All @@ -30,7 +30,7 @@ install:
- sed -ie "s/^plone.version.*/plone.version = $PLONE_VERSION/g" test_answers.ini
- sed -ie "s/^package.type.*/package.type = $PACKAGE_TYPE/g" test_answers.ini
- if [ "$PACKAGE_TYPE" == "Dexterity" ]; then echo "package.dexterity_type_name = MyDextrityTestType" >> test_answers.ini; fi
- bin/buildout -c travis.cfg
- bin/buildout -c ci.cfg

before_script:
- export DISPLAY=:99.0
Expand Down
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Expand Up @@ -13,6 +13,9 @@ Changelog
- Remove unittest2 dependency.
[gforcada]

- Rename travis.cfg to ci.cfg
[do3cc]


0.11 (2015-07-24)
-----------------
Expand Down
4 changes: 2 additions & 2 deletions bobtemplates/plone_addon/.travis.yml.bob
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ before_install:
- echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
- echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
install:
- python bootstrap-buildout.py -c travis.cfg
- bin/buildout -Nc travis.cfg
- python bootstrap-buildout.py -c ci.cfg
- bin/buildout -Nc ci.cfg
script:
- bin/code-analysis
- bin/test
Expand Down
0 bobtemplates/plone_addon/travis.cfg.bob → bobtemplates/plone_addon/ci.cfg.bob
View file
Open in desktop
File renamed without changes.
0 travis.cfg → ci.cfg
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests.py
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ def test_plone_addon_template(self):
self.project + '/src/collective/foo/tests/robot/test_example.robot', # noqa
self.project + '/src/collective/foo/tests/test_robot.py',
self.project + '/src/collective/foo/tests/test_setup.py',
self.project + '/travis.cfg',
self.project + '/ci.cfg',
self.project + '/.coveragerc',
self.project + '/.editorconfig',
self.project + '/.gitattributes',
Expand Down Expand Up @@ -170,7 +170,7 @@ def test_plone_addon_nested_template(self):
self.project + '/src/collective/foo/bar/tests/robot/test_example.robot', # noqa
self.project + '/src/collective/foo/bar/tests/test_robot.py',
self.project + '/src/collective/foo/bar/tests/test_setup.py',
self.project + '/travis.cfg',
self.project + '/ci.cfg',
self.project + '/.coveragerc',
self.project + '/.editorconfig',
self.project + '/.gitattributes',
Expand Down