Merge pull request #1555 from halfdan/1333-allowed-failure

Add postgres build and allow it to fail.
This commit is contained in:
Hannah Wolfe 2013-11-25 14:04:41 -08:00
commit cf4fdb3a49
3 changed files with 27 additions and 1 deletions

View File

@ -4,6 +4,10 @@ node_js:
env: env:
- DB=sqlite3 - DB=sqlite3
- DB=mysql - DB=mysql
- DB=pg
matrix:
allow_failures:
- env: DB=pg
before_install: before_install:
- git submodule update --init - git submodule update --init
- gem update --system - gem update --system
@ -15,6 +19,7 @@ before_install:
- export PATH=$PATH:`pwd`/bin - export PATH=$PATH:`pwd`/bin
- cd - - cd -
- if [ $DB == "mysql" ]; then mysql -e 'create database ghost_travis'; fi - if [ $DB == "mysql" ]; then mysql -e 'create database ghost_travis'; fi
- if [ $DB == "pg" ]; then psql -c 'create database ghost_travis;' -U postgres; fi
before_script: before_script:
- phantomjs --version - phantomjs --version
- casperjs --version - casperjs --version

View File

@ -116,6 +116,26 @@ config = {
host: '127.0.0.1', host: '127.0.0.1',
port: '2369' port: '2369'
} }
},
// ### Travis
// Automated testing run through GitHub
'travis-pg': {
url: 'http://127.0.0.1:2369',
database: {
client: 'pg',
connection: {
host : '127.0.0.1',
user : 'postgres',
password : '',
database : 'ghost_travis',
charset : 'utf8'
}
},
server: {
host: '127.0.0.1',
port: '2369'
}
} }
}; };

View File

@ -55,7 +55,8 @@
"when": "2.5.1" "when": "2.5.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"mysql": "2.0.0-alpha9" "mysql": "2.0.0-alpha9",
"pg": "~2.6.2"
}, },
"devDependencies": { "devDependencies": {
"blanket": "~1.1.5", "blanket": "~1.1.5",