Merge pull request #61 from GUIpsp/patch-1

Add zsh 5 to the Travis-CI build matrix.

Merge pull request #61 from GUIpsp/patch-1
Add zsh 5 to the Travis-CI build matrix.
Shrikant Sharat
2 parents e6888036d8 a46c71e3c8
Showing 2 changed files Side-by-side Diff
.travis.yml
travis-ppa.sh
-# Using python for running the tests, using `cram` test framework.
+# Using python for running the tests, using the `cram` test framework.
 language: python
  
 # Python version to run tests with.
 python:
   - "2.7"
  
+env:
+  # Default zsh
+  - PPA="none"
+  # zsh 5 PPA
+  - PPA="ppa:brainpower/testing"
+
 before_script:
  
   # Show the git version being used to test.
   - "git --version"
  
-  # Install zsh.
-  - "sudo apt-get install zsh"
+  # Show the zsh version being used to test.
+  - "zsh --version"
  
   # Test config for git.
   - "git config --global user.name test"
   - "git config --global user.email test@test.test"
  
-# Install python requirements.
-install: "pip install -r requirements.txt --use-mirrors"
+install:
+  # Add PPA if needed
+  - "./travis-ppa.sh"
+  # Install python requirements.
+  - "pip install -r requirements.txt --use-mirrors"
+  # Install zsh.
+  - "sudo apt-get install zsh"
  
 # Run the tests.
 script: "make tests"
@@ -0,0 +1,5 @@
+#! /bin/sh
+if [ $PPA != 'none' ];then
+    sudo apt-add-repository -y $PPA;
+    sudo apt-get update -qq;
+fi
1		-# Using python for running the tests, using `cram` test framework.
	1	+# Using python for running the tests, using the `cram` test framework.
2	2	language: python
3	3
4	4	# Python version to run tests with.
5	5	python:
6	6	- "2.7"
7	7
	8	+env:
	9	+ # Default zsh
	10	+ - PPA="none"
	11	+ # zsh 5 PPA
	12	+ - PPA="ppa:brainpower/testing"
	13	+
8	14	before_script:
9	15
10	16	# Show the git version being used to test.
11	17	- "git --version"
12	18
13		- # Install zsh.
14		- - "sudo apt-get install zsh"
	19	+ # Show the zsh version being used to test.
	20	+ - "zsh --version"
15	21
16	22	# Test config for git.
17	23	- "git config --global user.name test"
18	24	- "git config --global user.email test@test.test"
19	25
20		-# Install python requirements.
21		-install: "pip install -r requirements.txt --use-mirrors"
	26	+install:
	27	+ # Add PPA if needed
	28	+ - "./travis-ppa.sh"
	29	+ # Install python requirements.
	30	+ - "pip install -r requirements.txt --use-mirrors"
	31	+ # Install zsh.
	32	+ - "sudo apt-get install zsh"
22	33
23	34	# Run the tests.
24	35	script: "make tests"