Skip to content

Commit

Permalink
stop executing tests on Node 4 and 5, update documentation. (#2451)
Browse files Browse the repository at this point in the history
* general: stop executing tests on Node 4 and 5, update documentation.

* adds engines to package.json

* Update .travis.yml

* fix package.json

* Don't run tests on Node 10 yet

No prebuilt Oracle driver for Node 10 yet: oracle/node-oracledb#901
  • Loading branch information
igor-savin-ht authored and elhigu committed May 3, 2018
1 parent 88e4bc5 commit 4a6d287
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Expand Up @@ -9,12 +9,8 @@ matrix:
env: TEST_ORACLEDB=true DB="maria mysql mysql2 postgres sqlite3 oracledb" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000 ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe ORACLE_SID=XE OCI_LIB_DIR=/u01/app/oracle/product/11.2.0/xe/lib LD_LIBRARY_PATH=/u01/app/oracle/product/11.2.0/xe/lib
- node_js: "6"
env: TEST_ORACLEDB=true DB="maria mysql mysql2 postgres sqlite3 oracledb" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000 ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe ORACLE_SID=XE OCI_LIB_DIR=/u01/app/oracle/product/11.2.0/xe/lib LD_LIBRARY_PATH=/u01/app/oracle/product/11.2.0/xe/lib
- node_js: "4"
env: TEST_ORACLEDB=true DB="maria mysql mysql2 postgres sqlite3 oracledb" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000 ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe ORACLE_SID=XE OCI_LIB_DIR=/u01/app/oracle/product/11.2.0/xe/lib LD_LIBRARY_PATH=/u01/app/oracle/product/11.2.0/xe/lib
- node_js: "7"
env: DB="maria mysql mysql2 postgres sqlite3" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000
- node_js: "5"
env: DB="maria mysql mysql2 postgres sqlite3" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000
env: DB="maria mysql mysql2 postgres sqlite3" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000

before_install:
- if [ ! -z $TEST_ORACLEDB ]; then wget https://raw.githubusercontent.com/Vincit/travis-oracledb-xe/master/accept_the_license_agreement_for_oracledb_xe_11g_and_install.sh; fi
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
@@ -1,6 +1,8 @@

# Master (Unreleased)

- Drop support for Node.js 4 and 5

# 0.14.6 - 12 Apr, 2018

### Bug fixes:
Expand Down Expand Up @@ -77,7 +79,6 @@
- Disable oracledb tests from non LTS nodes #2407
- Update dependencies #2422


# 0.14.2 - 24 Nov, 2017

### Bug fixes:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -18,6 +18,8 @@ Node.js and the Browser, featuring:
- a [thorough test suite](https://travis-ci.org/tgriesser/knex)
- the ability to [run in the Browser](http://knexjs.org/#Installation-browser)

Node.js versions 6+ are supported.

[Read the full documentation to get started!](http://knexjs.org)

For support and questions, join the `#bookshelf` channel on freenode IRC
Expand Down
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -3,6 +3,9 @@
"version": "0.14.6",
"description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
"main": "knex.js",
"engines": {
"node": ">=6"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"bluebird": "^3.5.1",
Expand Down

0 comments on commit 4a6d287

Please sign in to comment.