Skip to content

Commit 2233a4e

Browse files
authored
Force node 21 in test suites with native modules (#4267)
1 parent 0f36e48 commit 2233a4e

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

.github/actions/node/21/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: Node 21
2+
runs:
3+
using: composite
4+
steps:
5+
- uses: actions/setup-node@v3
6+
with:
7+
node-version: '21'

.github/workflows/appsec.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: yarn test:appsec:ci
3232
- uses: ./.github/actions/node/20
3333
- run: yarn test:appsec:ci
34-
- uses: ./.github/actions/node/latest
34+
- uses: ./.github/actions/node/21
3535
- run: yarn test:appsec:ci
3636
- uses: codecov/codecov-action@v3
3737

@@ -65,7 +65,7 @@ jobs:
6565
- run: yarn install
6666
- uses: ./.github/actions/node/oldest
6767
- run: yarn test:appsec:plugins:ci
68-
- uses: ./.github/actions/node/latest
68+
- uses: ./.github/actions/node/21
6969
- run: yarn test:appsec:plugins:ci
7070
- uses: codecov/codecov-action@v3
7171

@@ -127,7 +127,7 @@ jobs:
127127
- run: yarn install
128128
- uses: ./.github/actions/node/oldest
129129
- run: yarn test:appsec:plugins:ci
130-
- uses: ./.github/actions/node/latest
130+
- uses: ./.github/actions/node/21
131131
- run: yarn test:appsec:plugins:ci
132132
- uses: codecov/codecov-action@v3
133133

@@ -141,7 +141,7 @@ jobs:
141141
- run: yarn install
142142
- uses: ./.github/actions/node/oldest
143143
- run: yarn test:appsec:plugins:ci
144-
- uses: ./.github/actions/node/latest
144+
- uses: ./.github/actions/node/21
145145
- run: yarn test:appsec:plugins:ci
146146
- uses: codecov/codecov-action@v3
147147

@@ -161,7 +161,7 @@ jobs:
161161
- run: yarn install
162162
- uses: ./.github/actions/node/oldest
163163
- run: yarn test:appsec:plugins:ci
164-
- uses: ./.github/actions/node/latest
164+
- uses: ./.github/actions/node/21
165165
- run: yarn test:appsec:plugins:ci
166166
- uses: codecov/codecov-action@v3
167167

@@ -181,7 +181,7 @@ jobs:
181181
- run: yarn install
182182
- uses: ./.github/actions/node/oldest
183183
- run: yarn test:appsec:plugins:ci
184-
- uses: ./.github/actions/node/latest
184+
- uses: ./.github/actions/node/21
185185
- run: yarn test:appsec:plugins:ci
186186
- uses: codecov/codecov-action@v3
187187

@@ -197,7 +197,7 @@ jobs:
197197
- run: yarn test:appsec:plugins:ci
198198
- uses: ./.github/actions/node/20
199199
- run: yarn test:appsec:plugins:ci
200-
- uses: ./.github/actions/node/latest
200+
- uses: ./.github/actions/node/21
201201
- run: yarn test:appsec:plugins:ci
202202
- uses: codecov/codecov-action@v3
203203

@@ -212,7 +212,7 @@ jobs:
212212
- run: yarn install
213213
- uses: ./.github/actions/node/oldest
214214
- run: yarn test:appsec:plugins:ci
215-
- uses: ./.github/actions/node/latest
215+
- uses: ./.github/actions/node/21
216216
- run: yarn test:appsec:plugins:ci
217217
- if: always()
218218
uses: ./.github/actions/testagent/logs

.github/workflows/profiling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: ./.github/actions/node/20
3535
- run: yarn test:profiler:ci
3636
- run: yarn test:integration:profiler
37-
- uses: ./.github/actions/node/latest
37+
- uses: ./.github/actions/node/21
3838
- run: yarn test:profiler:ci
3939
- run: yarn test:integration:profiler
4040
- uses: codecov/codecov-action@v3

.github/workflows/tracing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: yarn test:trace:core:ci
3232
- uses: ./.github/actions/node/20
3333
- run: yarn test:trace:core:ci
34-
- uses: ./.github/actions/node/latest
34+
- uses: ./.github/actions/node/21
3535
- run: yarn test:trace:core:ci
3636
- uses: codecov/codecov-action@v3
3737

packages/datadog-plugin-pino/test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('Plugin', () => {
133133
} else { // pino <7
134134
expect(record).to.have.property('msg', error.message)
135135
// ** TODO ** add this back once we fix it
136-
if (NODE_MAJOR !== 21) {
136+
if (NODE_MAJOR < 21) {
137137
expect(record).to.have.property('type', 'Error')
138138
expect(record).to.have.property('stack', error.stack)
139139
}

0 commit comments

Comments
 (0)