From 1fc4e29df5003a833b454f8594970455b65f23f9 Mon Sep 17 00:00:00 2001 From: Salman Mitha Date: Fri, 6 Nov 2020 22:13:39 +0530 Subject: [PATCH] fix: dependabot automerge (#40) * fix: dependabot config * fix: lint --- .github/dependabot.yml | 12 +++--- .github/workflows/dependabot-auto-merge.yml | 28 ------------- .github/workflows/nodejs.yml | 44 +++++++++++++++------ lib/vary.js | 4 +- 4 files changed, 40 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/dependabot-auto-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2f095dd..3d3a116 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,7 @@ version: 2 updates: -- package-ecosystem: npm - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - labels: - - "dependabot" + - package-ecosystem: npm + directory: '/' + schedule: + interval: daily + open-pull-requests-limit: 10 diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml deleted file mode 100644 index e68b40e..0000000 --- a/.github/workflows/dependabot-auto-merge.yml +++ /dev/null @@ -1,28 +0,0 @@ -# dependabot[bot] - -name: Dependabot Auto Merge - -on: - check_suite: - types: - - completed - pull_request: - types: - - edited - - labeled - - opened - - ready_for_review - - reopened - - synchronize - - unlabeled - - unlocked - -jobs: - worker: - runs-on: ubuntu-latest - steps: - - name: automerge - uses: ridedott/merge-me-action@v1.8.28 - with: - GITHUB_LOGIN: dependabot[bot] - GITHUB_TOKEN: ${{github.token}} diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 98d9555..fa09079 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -13,17 +13,39 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} - - name: Install - run: | - npm install + - name: Install + run: | + npm install - - name: Test - run: | - npm test + - name: Test + run: | + npm test + + automerge: + needs: test + runs-on: ubuntu-latest + steps: + - name: Dependabot Auto Merge + uses: actions/github-script@v3 + if: ${{ github.actor == 'dependabot[bot]' }} + with: + github-token: ${{secrets.github_token}} + script: | + github.pulls.createReview({ + owner: context.payload.repository.owner.login, + repo: context.payload.repository.name, + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }) + github.pulls.merge({ + owner: context.payload.repository.owner.login, + repo: context.payload.repository.name, + pull_number: context.payload.pull_request.number + }) diff --git a/lib/vary.js b/lib/vary.js index 5946d6f..74a4022 100644 --- a/lib/vary.js +++ b/lib/vary.js @@ -5,8 +5,8 @@ const append = require('vary').append // Same implementation of https://github.com/jshttp/vary // but adapted to the Fastify API function vary (field) { - var value = this.getHeader('Vary') || '' - var header = Array.isArray(value) + let value = this.getHeader('Vary') || '' + const header = Array.isArray(value) ? value.join(', ') : String(value)