From a387e7d9296bd175d7c7633e668d85b8d0377a51 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Mon, 11 Jul 2022 08:47:48 +0000 Subject: [PATCH 1/4] ci!: update workflow --- .github/workflows/nodejs.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 924bcbe6..dcbed95a 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -2,6 +2,11 @@ name: Node.js CI on: [ push, pull_request ] +# This allows a subsequently queued workflow run to interrupt previous runs +concurrency: + group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}" + cancel-in-progress: true + jobs: test: runs-on: ${{ matrix.os }} @@ -10,12 +15,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - node-version: [12, 14, 15, 16] + node-version: [14, 16, 18] steps: - uses: actions/checkout@v3 + with: + persist-credentials: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.4.0 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - run: node --version @@ -26,6 +33,9 @@ jobs: CI: true automerge: + if: > + github.event_name == 'pull_request' && + github.event.pull_request.user.login == 'dependabot[bot]' needs: test runs-on: ubuntu-latest permissions: From f7b3a52db869bb727bb2226da5211270ef7bddaf Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Mon, 25 Jul 2022 15:51:29 +0100 Subject: [PATCH 2/4] test: replace test pkcs12 file --- test/keystore.pkcs12 | Bin 2717 -> 2867 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/keystore.pkcs12 b/test/keystore.pkcs12 index 45b47887603f841788c63a90a14f2148632444f8..99ddcc5efc55395be362397e36a9b08c93a06f16 100644 GIT binary patch literal 2867 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 Date: Tue, 23 Aug 2022 10:09:29 +0100 Subject: [PATCH 3/4] ci: exclude esm dependencies from automerge --- .github/workflows/nodejs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index dcbed95a..6b28ed1f 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -44,4 +44,5 @@ jobs: steps: - uses: fastify/github-action-merge-dependabot@v3 with: + exclude: 'chalk;pretty-bytes' github-token: ${{ secrets.github_token }} From a418cfede5fa7a67abd9d0743e74f1eebe57d490 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Tue, 23 Aug 2022 11:15:09 +0100 Subject: [PATCH 4/4] style(samples): standard fixes --- samples/customise-verifyBody-workers.js | 2 +- samples/customise-verifyBody.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/customise-verifyBody-workers.js b/samples/customise-verifyBody-workers.js index 6d76ed3e..4333ce35 100644 --- a/samples/customise-verifyBody-workers.js +++ b/samples/customise-verifyBody-workers.js @@ -16,7 +16,7 @@ function startBench () { const url = 'http://localhost:' + server.address().port autocannon({ - url: url, + url, connections: 1000, duration: 10, workers: 2, diff --git a/samples/customise-verifyBody.js b/samples/customise-verifyBody.js index d5c52309..03097ec4 100644 --- a/samples/customise-verifyBody.js +++ b/samples/customise-verifyBody.js @@ -15,10 +15,10 @@ function startBench () { const url = 'http://localhost:' + server.address().port autocannon({ - url: url, + url, connections: 1000, duration: 10, - verifyBody: verifyBody + verifyBody }, finishedBench) function verifyBody (body) {