Skip to content

Commit ce9e373

Browse files
authored
Merge branch '8.x' into generates_8.x_code
2 parents 027f6a6 + 4ca358c commit ce9e373

File tree

6 files changed

+48
-45
lines changed

6 files changed

+48
-45
lines changed

.github/workflows/nodejs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
outputs:
1212
src-only: "${{ steps.changes.outputs.src-only }}"
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1515
with:
1616
persist-credentials: false
17-
- uses: dorny/paths-filter/@v3.0.2
17+
- uses: dorny/paths-filter/@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
1818
id: changes
1919
with:
2020
filters: |
@@ -36,12 +36,12 @@ jobs:
3636
os: [ubuntu-latest, windows-latest, macOS-latest]
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4040
with:
4141
persist-credentials: false
4242

4343
- name: Use Node.js ${{ matrix.node-version }}
44-
uses: actions/setup-node@v4
44+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
4545
with:
4646
node-version: ${{ matrix.node-version }}
4747

@@ -62,12 +62,12 @@ jobs:
6262
runs-on: ubuntu-latest
6363

6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6666
with:
6767
persist-credentials: false
6868

6969
- name: Use Node.js
70-
uses: actions/setup-node@v4
70+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
7171
with:
7272
node-version: 22.x
7373

@@ -92,12 +92,12 @@ jobs:
9292
os: [ubuntu-latest, windows-latest, macOS-latest]
9393

9494
steps:
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9696
with:
9797
persist-credentials: false
9898

9999
- name: Use Bun
100-
uses: oven-sh/setup-bun@v2
100+
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
101101

102102
- name: Install
103103
run: |

.github/workflows/npm-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
contents: write
1313
id-token: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1616
with:
1717
persist-credentials: false
1818
ref: ${{ github.event.inputs.branch }}
19-
- uses: actions/setup-node@v4
19+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
2020
with:
2121
node-version: "22.x"
2222
registry-url: "https://registry.npmjs.org"

.github/workflows/serverless-patch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
)
2727
)
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3030
with:
3131
persist-credentials: false
3232
repository: elastic/elasticsearch-js
3333
ref: main
3434
path: stack
3535
fetch-depth: 0
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3737
with:
3838
persist-credentials: false
3939
repository: elastic/elasticsearch-serverless-js
@@ -42,7 +42,7 @@ jobs:
4242
- name: Apply patch from stack to serverless
4343
id: apply-patch
4444
run: $GITHUB_WORKSPACE/stack/.github/workflows/serverless-patch.sh
45-
- uses: peter-evans/create-pull-request@v6
45+
- uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
4646
with:
4747
token: ${{ secrets.GH_TOKEN }}
4848
path: serverless

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
stale:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v8
11+
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
1212
with:
1313
stale-issue-label: stale
1414
stale-pr-label: stale

package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,38 @@
5353
"node": ">=18"
5454
},
5555
"devDependencies": {
56-
"@elastic/request-converter": "^8.15.2",
56+
"@elastic/request-converter": "8.16.0",
5757
"@sinonjs/fake-timers": "github:sinonjs/fake-timers#0bfffc1",
58-
"@types/debug": "^4.1.7",
59-
"@types/ms": "^0.7.31",
60-
"@types/node": "^18.19.55",
61-
"@types/sinonjs__fake-timers": "^8.1.2",
62-
"@types/split2": "^3.2.1",
63-
"@types/stoppable": "^1.1.1",
64-
"@types/tap": "^15.0.7",
65-
"chai": "^4.3.7",
66-
"cross-zip": "^4.0.0",
67-
"desm": "^1.2.0",
68-
"into-stream": "^7.0.0",
69-
"js-yaml": "^4.1.0",
70-
"license-checker": "^25.0.1",
71-
"minimist": "^1.2.6",
72-
"ms": "^2.1.3",
73-
"node-abort-controller": "^3.0.1",
74-
"node-fetch": "^2.6.7",
75-
"ora": "^5.4.1",
76-
"proxy": "^1.0.2",
77-
"rimraf": "^3.0.2",
78-
"semver": "^7.3.7",
79-
"split2": "^4.1.0",
80-
"stoppable": "^1.1.0",
81-
"tap": "^21.0.1",
82-
"ts-node": "^10.7.0",
83-
"ts-standard": "^11.0.0",
84-
"typescript": "^4.6.4",
85-
"workq": "^3.0.0",
86-
"xmlbuilder2": "^3.0.2",
87-
"zx": "^7.2.2"
58+
"@types/debug": "4.1.12",
59+
"@types/ms": "0.7.34",
60+
"@types/node": "18.19.59",
61+
"@types/sinonjs__fake-timers": "8.1.5",
62+
"@types/split2": "3.2.1",
63+
"@types/stoppable": "1.1.3",
64+
"@types/tap": "15.0.12",
65+
"chai": "4.5.0",
66+
"cross-zip": "4.0.1",
67+
"desm": "1.3.1",
68+
"into-stream": "7.0.0",
69+
"js-yaml": "4.1.0",
70+
"license-checker": "25.0.1",
71+
"minimist": "1.2.8",
72+
"ms": "2.1.3",
73+
"node-abort-controller": "3.1.1",
74+
"node-fetch": "2.7.0",
75+
"ora": "5.4.1",
76+
"proxy": "1.0.2",
77+
"rimraf": "3.0.2",
78+
"semver": "7.6.3",
79+
"split2": "4.2.0",
80+
"stoppable": "1.1.0",
81+
"tap": "21.0.1",
82+
"ts-node": "10.9.2",
83+
"ts-standard": "11.0.0",
84+
"typescript": "4.9.5",
85+
"workq": "3.0.0",
86+
"xmlbuilder2": "3.1.1",
87+
"zx": "7.2.3"
8888
},
8989
"dependencies": {
9090
"@elastic/transport": "^8.9.0",

test/unit/helpers/bulk.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,6 +1819,7 @@ test('Flush interval', t => {
18191819
})
18201820

18211821
server.stop()
1822+
t.end()
18221823
})
18231824

18241825
test(`flush timeout does not lock process when flushInterval is greater than server timeout`, async t => {
@@ -1868,6 +1869,7 @@ test('Flush interval', t => {
18681869
})
18691870

18701871
server.stop()
1872+
t.end()
18711873
})
18721874

18731875
test(`flush timeout does not lock process when flushInterval is equal to server timeout`, async t => {
@@ -1917,6 +1919,7 @@ test('Flush interval', t => {
19171919
})
19181920

19191921
server.stop()
1922+
t.end()
19201923
})
19211924

19221925
t.end()

0 commit comments

Comments
 (0)