Skip to content

Commit 63b6eca

Browse files
authored
test, ci: some small changes (#3183)
- Avoid test, lint, & edge CI workflows for .md and .asciidoc changes in any subdir. - Tweak the "types" test (npm run test:types) to catch the case of `apm.flush()` with no callback returning a promise.
1 parent 45cb30b commit 63b6eca

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/edge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
branches:
1212
- main
1313
paths-ignore:
14-
- '**.md'
15-
- '**.asciidoc'
14+
- '**/**.md'
15+
- '**/**.asciidoc'
1616
- 'docs/**'
1717
- 'examples/**'
1818

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
branches:
88
- main
99
paths-ignore:
10-
- '*.md'
11-
- '*.asciidoc'
10+
- '**/*.md'
11+
- '**/*.asciidoc'
1212
- 'docs/**'
1313
pull_request:
1414
branches:
1515
- main
1616
paths-ignore:
17-
- '*.md'
18-
- '*.asciidoc'
17+
- '**/*.md'
18+
- '**/*.asciidoc'
1919
- 'docs/**'
2020

2121
jobs:

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ on:
1616
branches:
1717
- main
1818
paths-ignore:
19-
- '*.md'
20-
- '*.asciidoc'
19+
- '**/*.md'
20+
- '**/*.asciidoc'
2121
- 'docs/**'
2222
- 'examples/**'
2323
pull_request:
2424
branches:
2525
- main
2626
paths-ignore:
27-
- '*.md'
28-
- '*.asciidoc'
27+
- '**/*.md'
28+
- '**/*.asciidoc'
2929
- 'docs/**'
3030
- 'examples/**'
3131

examples/trace-redis.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
// A small example showing Elastic APM tracing the 'redis' package.
1010
//
1111
// This assumes a Redis server running on localhost. You can use:
12-
// npm run docker:start
13-
// to start an Redis docker container (and other containers used for
14-
// testing of this project). Then `npm run docker:stop` to stop them.
12+
// npm run docker:start redis
13+
// to start an Redis docker container. Then `npm run docker:stop` to stop it.
1514

1615
const apm = require('../').start({ // elastic-apm-node
1716
serviceName: 'example-trace-redis4',

test/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ apm.addMetadataFilter(filter1)
161161
apm.addMetadataFilter(filter2)
162162
apm.addMetadataFilter(filter3)
163163

164-
apm.flush()
164+
apm.flush().finally(() => {})
165165
apm.flush(() => {})
166166

167167
apm.destroy()

0 commit comments

Comments
 (0)