Skip to content

Commit 7c49042

Browse files
committed
feat: node 15 support
Fixes elastic#1840
1 parent 25fa027 commit 7c49042

6 files changed

+10
-2
lines changed

.ci/.jenkins_nightly_nodejs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NODEJS_VERSION:
2+
- "15"
23
- "14"
34
- "13"
45
- "12"

.ci/.jenkins_nodejs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NODEJS_VERSION:
2+
- "15"
23
- "14"
34
- "14.0"
45
- "13"

.ci/.jenkins_rc_nodejs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NODEJS_VERSION:
2+
- "15"
23
- "14"
34
- "13"
45
- "12"

.ci/.jenkins_tav_nodejs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NODEJS_VERSION:
2+
- "15"
23
- "14"
34
- "13"
45
- "12"

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ before_script:
4242
- wait-on tcp:9200
4343

4444
node_js:
45+
- '15'
4546
- '14'
4647
- '14.0'
4748
- '13'
@@ -57,6 +58,9 @@ jobs:
5758

5859
include:
5960
# Disable Async Hooks
61+
-
62+
node_js: '15'
63+
env: ELASTIC_APM_ASYNC_HOOKS=false
6064
-
6165
node_js: '14'
6266
env: ELASTIC_APM_ASYNC_HOOKS=false

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"url": "git://github.com/elastic/apm-agent-nodejs.git"
4646
},
4747
"engines": {
48-
"node": "^8.6.0 || 10 || 12 || 13 || 14"
48+
"node": "^8.6.0 || 10 || 12 || 13 || 14 || 15"
4949
},
5050
"keywords": [
5151
"opbeat",
@@ -145,7 +145,7 @@
145145
"generic-pool": "^3.7.1",
146146
"get-port": "^5.1.1",
147147
"got": "^9.6.0",
148-
"graphql": "^15.3.0",
148+
"graphql": "^14.7.0",
149149
"handlebars": "^4.7.3",
150150
"hapi": "^18.1.0",
151151
"https-pem": "^2.0.0",

0 commit comments

Comments
 (0)