From 2378847442f20c1429201b8c0aa4bea0b2675eab Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Tue, 6 Apr 2021 08:00:10 +0100 Subject: [PATCH 1/4] chore(package): sort scripts alphabetically ascending --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a4efea5..12471da 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "main": "index.js", "types": "index.d.ts", "scripts": { - "test": "npm run lint && npm run unit && npm run typescript", "lint": "standard", - "unit": "tap test/test.js", + "redis": "docker run -p 6379:6379 --rm redis:5", + "test": "npm run lint && npm run unit && npm run typescript", "typescript": "tsd", - "redis": "docker run -p 6379:6379 --rm redis:5" + "unit": "tap test/test.js" }, "repository": { "type": "git", From 1ce02206734f8329dd4e3a7bfbfc65a4b32f37f1 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Tue, 6 Apr 2021 08:00:47 +0100 Subject: [PATCH 2/4] docs(readme): add badges --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b05f88..806eb17 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # fastify-redis -[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/) ![CI workflow](https://github.com/fastify/fastify-redis/workflows/CI%20workflow/badge.svg) +![CI](https://github.com/fastify/fastify-redis/workflows/CI/badge.svg) +[![NPM version](https://img.shields.io/npm/v/fastify-redis.svg?style=flat)](https://www.npmjs.com/package/fastify-redis) +[![Known Vulnerabilities](https://snyk.io/test/github/fastify/fastify-redis/badge.svg)](https://snyk.io/test/github/fastify/fastify-redis) +[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://standardjs.com/) Fastify Redis connection plugin, with this you can share the same Redis connection in every part of your server. From 2c3281b05faea7d43e42301c370f32eb330983a1 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Tue, 6 Apr 2021 09:46:54 +0100 Subject: [PATCH 3/4] ci: ignore documentation updates --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5da166..ff7df31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,15 @@ name: CI workflow -on: [push, pull_request] + +on: + push: + paths-ignore: + - 'docs/**' + - '*.md' + pull_request: + paths-ignore: + - 'docs/**' + - '*.md' + jobs: test: runs-on: ubuntu-latest From 29f8c4898b454df8d07ed1ec73491eff189000d3 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Tue, 6 Apr 2021 09:47:33 +0100 Subject: [PATCH 4/4] style(ci): use standardized template --- .github/workflows/ci.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff7df31..019365e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI workflow +name: CI on: push: @@ -13,6 +13,7 @@ on: jobs: test: runs-on: ubuntu-latest + strategy: matrix: node-version: [10.x, 12.x, 14.x] @@ -24,20 +25,24 @@ jobs: options: --entrypoint redis-server steps: - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} + + - name: Use Node.js uses: actions/setup-node@v2.1.5 with: - node-version: ${{ matrix.node-version }} - - name: Install Dependencies - run: npm install --ignore-scripts - - name: Test - run: npm test + node-version: ${{ matrix.node-version }} + + - name: Install Dependencies + run: | + npm install --ignore-scripts + + - name: Run Tests + run: | + npm run test automerge: needs: test runs-on: ubuntu-latest steps: - uses: fastify/github-action-merge-dependabot@v2.0.0 - if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }} with: - github-token: ${{secrets.github_token}} + github-token: ${{ secrets.GITHUB_TOKEN }}