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

Execute tests on Node 12 #3171

Merged
merged 12 commits into from
May 11, 2019
Merged

Execute tests on Node 12 #3171

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
18532b2
Bump version to 0.16.4
kibertoad Apr 11, 2019
f28ae7a
Merge branch 'master' of https://github.com/tgriesser/knex
kibertoad Apr 11, 2019
eb136f1
Merge branch 'master' of https://github.com/tgriesser/knex
kibertoad Apr 11, 2019
3b87132
Merge branch 'master' of https://github.com/tgriesser/knex
kibertoad Apr 11, 2019
f909692
Merge branch 'master' of https://github.com/tgriesser/knex
kibertoad Apr 28, 2019
4c6a314
Execute tests on Node 12 as opposed to Node 11
kibertoad Apr 28, 2019
01bb540
Update dependencies
kibertoad May 10, 2019
97466c3
Add gcc 5 to try fixing sqlite building
kibertoad May 10, 2019
2cce7ac
Update ubuntu
kibertoad May 10, 2019
50b6a48
Try removing source
kibertoad May 10, 2019
f83ae41
Use correct mysql packages for Xenial
kibertoad May 10, 2019
b99c4b3
Try removing some packages
kibertoad May 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# .travis.yml
language: node_js
dist: trusty
dist: xenial
sudo: required

cache:
Expand All @@ -10,7 +10,7 @@ cache:
matrix:
fast_finish: true
include:
- node_js: "11"
- node_js: "12"
env: DB="mssql mysql mysql2 postgres sqlite3" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000
- node_js: "10"
env: DB="mssql mysql mysql2 postgres sqlite3" CXX=g++-4.8 KNEX_TEST_TIMEOUT=60000
Expand Down Expand Up @@ -60,13 +60,13 @@ services:
addons:
postgresql: '9.6'
apt:
sources:
- mysql-5.7-trusty
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MySQL 5.7 is default on Xenial, no explicit sources are needed.

packages:
- g++-4.8
- gcc-4.8
- g++-5
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new SQLite version requires gcc 5

- gcc-5
- libmysqlclient-dev
- libmysqlclient20
- mysql-community-client
- mysql-common
- mysql-community-server
- mysql-server
- mysql-client
38 changes: 19 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": ">=6"
},
"dependencies": {
"@babel/polyfill": "^7.4.3",
"@babel/polyfill": "^7.4.4",
"@types/bluebird": "^3.5.26",
"bluebird": "^3.5.4",
"colorette": "1.0.7",
Expand All @@ -24,7 +24,7 @@
"tarn": "^1.1.5",
"tildify": "1.2.0",
"uuid": "^3.3.2",
"v8flags": "^3.1.2"
"v8flags": "^3.1.3"
},
"lint-staged": {
"*.{js,json}": [
Expand All @@ -33,39 +33,39 @@
]
},
"devDependencies": {
"@babel/cli": "^7.4.3",
"@babel/core": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@types/node": "^11.11.3",
"@babel/cli": "^7.4.4",
"@babel/core": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@types/node": "^11.13.10",
"JSONStream": "^1.3.5",
"async": "^2.6.2",
"babel-eslint": "^10.0.1",
"babel-plugin-add-module-exports": "^1.0.0",
"babel-plugin-add-module-exports": "^1.0.2",
"chai": "^4.2.0",
"chai-subset-in-order": "^2.1.3",
"coveralls": "^3.0.3",
"cross-env": "^5.2.0",
"eslint": "5.16.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-import": "^2.16.0",
"eslint-config-prettier": "^4.2.0",
"eslint-plugin-import": "^2.17.2",
"husky": "^1.3.1",
"jake": "^8.1.1",
"json-loader": "^0.5.7",
"lint-staged": "^8.1.5",
"mocha": "^6.1.2",
"mock-fs": "^4.8.0",
"mssql": "^5.0.5",
"mysql": "^2.16.0",
"lint-staged": "^8.1.6",
"mocha": "^6.1.4",
"mock-fs": "^4.9.0",
"mssql": "^5.1.0",
"mysql": "^2.17.1",
"mysql2": "^1.6.5",
"nyc": "^13.3.0",
"pg": "^7.9.0",
"nyc": "^14.1.1",
"pg": "^7.11.0",
"pg-query-stream": "^2.0.0",
"prettier": "^1.16.4",
"prettier": "^1.17.0",
"rimraf": "^2.6.3",
"sinon": "^7.3.1",
"sinon": "^7.3.2",
"sinon-chai": "^3.3.0",
"source-map-support": "^0.5.12",
"sqlite3": "^4.0.6",
"sqlite3": "^4.0.7",
"tap-spec": "^5.0.0",
"tape": "^4.10.1",
"through": "^2.3.8",
Expand Down