Skip to content

Commit

Permalink
Merge pull request #15685 from CartoDB/node-12
Browse files Browse the repository at this point in the history
Add support for Node.js 12
  • Loading branch information
dgaubert authored May 27, 2020
2 parents abea5e0 + 42c70b6 commit 027f4d1
Show file tree
Hide file tree
Showing 5 changed files with 404 additions and 234 deletions.
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,12 @@ jobs:
- npm ci # clean install
script:
- npm run ci # run tests
- node_js:
- "12"
before_install:
- git submodule update --init --recursive
- git fetch origin master:refs/remotes/origin/master --depth=1
install:
- npm ci # clean install
script:
- npm run ci # run tests
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var lockedDependencies = require('./lib/build/tasks/locked-dependencies.js');
var webpackTask = null;
var EDITOR_ASSETS_VERSION = require('./config/editor_assets_version.json').version;

var REQUIRED_NODE_VERSIONS = ['10.x'];
var REQUIRED_NODE_VERSIONS = ['10.x', '12.x'];
var REQUIRED_NPM_VERSIONS = ['6.x'];

var DEVELOPMENT = 'development';
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Development
- Rake tasks to list DB Direct certificates ([#15625](https://github.com/CartoDB/cartodb/pull/15625))
- PKCS#8 keys support for DB-Direct certificates ([#15622](https://github.com/CartoDB/cartodb/pull/15622))
- UI for managing IPs and Certificates for DB Direct connections ([#15589](https://github.com/CartoDB/cartodb/pull/15589))
- Add support for Node.js 12

### Bug fixes / enhancements
- Add maxRetries for aws s3 operation to improve reliability ([#15679](https://github.com/CartoDB/cartodb/pull/15679))
Expand Down
Loading

0 comments on commit 027f4d1

Please sign in to comment.