Skip to content

Commit da2ccf1

Browse files
committed
Manually backport #2375 to 8.x
1 parent 604d4ae commit da2ccf1

File tree

5 files changed

+16
-33
lines changed

5 files changed

+16
-33
lines changed

.github/workflows/auto-merge.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/nodejs.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
src-only: "${{ steps.changes.outputs.src-only }}"
1313
steps:
1414
- uses: actions/checkout@v4
15+
with:
16+
persist-credentials: false
1517
- uses: dorny/paths-filter/@v3.0.2
1618
id: changes
1719
with:
@@ -35,6 +37,8 @@ jobs:
3537

3638
steps:
3739
- uses: actions/checkout@v4
40+
with:
41+
persist-credentials: false
3842

3943
- name: Use Node.js ${{ matrix.node-version }}
4044
uses: actions/setup-node@v4
@@ -59,6 +63,8 @@ jobs:
5963

6064
steps:
6165
- uses: actions/checkout@v4
66+
with:
67+
persist-credentials: false
6268

6369
- name: Use Node.js
6470
uses: actions/setup-node@v4
@@ -87,6 +93,8 @@ jobs:
8793

8894
steps:
8995
- uses: actions/checkout@v4
96+
with:
97+
persist-credentials: false
9098

9199
- name: Use Bun
92100
uses: oven-sh/setup-bun@v2
@@ -102,13 +110,3 @@ jobs:
102110
- name: Unit test
103111
run: |
104112
bun run test:unit-bun
105-
106-
auto-approve:
107-
name: Auto-approve
108-
needs: [test, license]
109-
runs-on: ubuntu-latest
110-
permissions:
111-
pull-requests: write
112-
if: github.actor == 'elasticmachine'
113-
steps:
114-
- uses: hmarr/auto-approve-action@v4

.github/workflows/npm-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
with:
17+
persist-credentials: false
1718
ref: ${{ github.event.inputs.branch }}
1819
- uses: actions/setup-node@v4
1920
with:

.github/workflows/serverless-patch.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
31+
persist-credentials: false
3132
repository: elastic/elasticsearch-js
3233
ref: main
3334
path: stack
3435
fetch-depth: 0
3536
- uses: actions/checkout@v4
3637
with:
38+
persist-credentials: false
3739
repository: elastic/elasticsearch-serverless-js
3840
ref: main
3941
path: serverless
@@ -44,8 +46,8 @@ jobs:
4446
with:
4547
token: ${{ secrets.GH_TOKEN }}
4648
path: serverless
47-
title: 'Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}'
48-
commit-message: 'Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}'
49+
title: "Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}"
50+
commit-message: "Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}"
4951
body-path: /tmp/pr_body
50-
draft: '${{ steps.apply-patch.outputs.PR_DRAFT }}'
51-
add-paths: ':!*.rej'
52+
draft: "${{ steps.apply-patch.outputs.PR_DRAFT }}"
53+
add-paths: ":!*.rej"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@sinonjs/fake-timers": "github:sinonjs/fake-timers#0bfffc1",
5858
"@types/debug": "^4.1.7",
5959
"@types/ms": "^0.7.31",
60-
"@types/node": "^17.0.31",
60+
"@types/node": "^18.19.55",
6161
"@types/sinonjs__fake-timers": "^8.1.2",
6262
"@types/split2": "^3.2.1",
6363
"@types/stoppable": "^1.1.1",

0 commit comments

Comments
 (0)