mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-27 22:49:56 -05:00
Merge pull request #4395 from jaswilli/pg
Add pg as an optional dependency.
This commit is contained in:
commit
5cbf8dd4d0
2 changed files with 3 additions and 5 deletions
|
@ -12,9 +12,6 @@ env:
|
||||||
- DB=sqlite3 NODE_ENV=testing
|
- DB=sqlite3 NODE_ENV=testing
|
||||||
- DB=mysql NODE_ENV=testing-mysql
|
- DB=mysql NODE_ENV=testing-mysql
|
||||||
- DB=pg NODE_ENV=testing-pg
|
- DB=pg NODE_ENV=testing-pg
|
||||||
matrix:
|
|
||||||
allow_failures:
|
|
||||||
- env: DB=pg NODE_ENV=testing-pg
|
|
||||||
before_install:
|
before_install:
|
||||||
- git clone git://github.com/n1k0/casperjs.git ~/casperjs
|
- git clone git://github.com/n1k0/casperjs.git ~/casperjs
|
||||||
- cd ~/casperjs
|
- cd ~/casperjs
|
||||||
|
@ -22,7 +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_testing'; fi
|
- if [ $DB == "mysql" ]; then mysql -e 'create database ghost_testing'; fi
|
||||||
- if [ $DB == "pg" ]; then npm install pg; psql -c 'create database ghost_testing;' -U postgres; fi
|
- if [ $DB == "pg" ]; then psql -c 'create database ghost_testing;' -U postgres; fi
|
||||||
before_script:
|
before_script:
|
||||||
- phantomjs --version
|
- phantomjs --version
|
||||||
- casperjs --version
|
- casperjs --version
|
||||||
|
|
|
@ -65,7 +65,8 @@
|
||||||
"xml": "0.0.12"
|
"xml": "0.0.12"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"mysql": "2.5.2"
|
"mysql": "2.5.2",
|
||||||
|
"pg": "3.6.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"blanket": "~1.1.6",
|
"blanket": "~1.1.6",
|
||||||
|
|
Loading…
Add table
Reference in a new issue