diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index f283bd655..000000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Automerge - -on: - pull_request_review: - types: - - submitted - -jobs: - automerge: - runs-on: ubuntu-latest - if: github.event.review.state == 'approved' - steps: - - uses: reitermarkus/automerge@v2 - with: - token: ${{ secrets.GH_TOKEN }} - merge-method: squash - pull-request-author-associations: OWNER - review-author-associations: OWNER,CONTRIBUTOR diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 7dbec6fb0..dd93e3bdd 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -12,6 +12,8 @@ jobs: src-only: "${{ steps.changes.outputs.src-only }}" steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - uses: dorny/paths-filter/@v3.0.2 id: changes with: @@ -35,6 +37,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 @@ -59,6 +63,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Use Node.js uses: actions/setup-node@v4 @@ -87,6 +93,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Use Bun uses: oven-sh/setup-bun@v2 @@ -102,13 +110,3 @@ jobs: - name: Unit test run: | bun run test:unit-bun - - auto-approve: - name: Auto-approve - needs: [test, license] - runs-on: ubuntu-latest - permissions: - pull-requests: write - if: github.actor == 'elasticmachine' - steps: - - uses: hmarr/auto-approve-action@v4 diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 0b6d77877..956b688ec 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -14,6 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false ref: ${{ github.event.inputs.branch }} - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/serverless-patch.yml b/.github/workflows/serverless-patch.yml index 9cf9926a4..f3ae92f9e 100644 --- a/.github/workflows/serverless-patch.yml +++ b/.github/workflows/serverless-patch.yml @@ -28,12 +28,14 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false repository: elastic/elasticsearch-js ref: main path: stack fetch-depth: 0 - uses: actions/checkout@v4 with: + persist-credentials: false repository: elastic/elasticsearch-serverless-js ref: main path: serverless @@ -44,8 +46,8 @@ jobs: with: token: ${{ secrets.GH_TOKEN }} path: serverless - title: 'Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}' - commit-message: 'Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}' + title: "Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}" + commit-message: "Apply patch from elastic/elasticsearch-js#${{ github.event.pull_request.number }}" body-path: /tmp/pr_body - draft: '${{ steps.apply-patch.outputs.PR_DRAFT }}' - add-paths: ':!*.rej' + draft: "${{ steps.apply-patch.outputs.PR_DRAFT }}" + add-paths: ":!*.rej" diff --git a/package.json b/package.json index 63bd50cea..2b4b5820a 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@sinonjs/fake-timers": "github:sinonjs/fake-timers#0bfffc1", "@types/debug": "^4.1.7", "@types/ms": "^0.7.31", - "@types/node": "^18.11.9", + "@types/node": "^18.19.55", "@types/sinonjs__fake-timers": "^8.1.2", "@types/split2": "^3.2.1", "@types/stoppable": "^1.1.1",