From 6a4463f2978bdcd2c8c8e58586ae1a697e3a904e Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Sun, 19 Jun 2022 17:09:19 +0100 Subject: [PATCH 1/4] chore(.gitignore): use latest github ignore template --- .gitignore | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9ae6896..20dae0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,149 @@ +# Logs +logs *.log -node_modules -*.tgz -.idea +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage .nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +# Vim swap files +*.swp + +# macOS files +.DS_Store + +# editor files .vscode +.idea + +# lock files package-lock.json +pnpm-lock.yaml +yarn.lock + +# 0x +.__browserify* +profile-* \ No newline at end of file From ff9fc572c21e3012a9ba9cc8d94338e2c42848b3 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Sun, 19 Jun 2022 17:12:22 +0100 Subject: [PATCH 2/4] docs(readme): remove snyk badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0006999..c47a38b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # pino-mongodb [![npm version](https://img.shields.io/npm/v/pino-mongodb)](https://www.npmjs.com/package/pino-mongodb) [![Build Status](https://img.shields.io/github/workflow/status/pinojs/pino-mongodb/CI)](https://github.com/pinojs/pino-mongodb/actions) -[![Known Vulnerabilities](https://snyk.io/test/github/pinojs/pino-mongodb/badge.svg)](https://snyk.io/test/github/pinojs/pino-mongodb) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://standardjs.com/) > Insert JSON from stdin into MongoDB From c5ea3a0c985544120bc1007a32e1b0334a1b8afb Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Sun, 19 Jun 2022 18:04:23 +0100 Subject: [PATCH 3/4] ci: update workflows --- .github/workflows/ci.yml | 69 +++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6acec6e..8bcc268 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,5 @@ name: CI + on: push: paths-ignore: @@ -8,30 +9,52 @@ on: paths-ignore: - 'docs/**' - '*.md' + +# 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: + dependency-review: + name: Dependency Review + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Check out repo + uses: actions/checkout@v3 + with: + persist-credentials: false + + - name: Dependency review + uses: actions/dependency-review-action@v1 + test: runs-on: ${{ matrix.os }} - + permissions: + contents: read strategy: matrix: node-version: [12, 14, 16] os: [macos-latest, windows-latest] - steps: - - uses: actions/checkout@v3 + - name: Check out repo + uses: actions/checkout@v3 + with: + persist-credentials: false - - name: Use Node.js - uses: actions/setup-node@v3.2.0 + - name: Setup Node ${{ matrix.node-version }} + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - name: Install - run: | - npm install --ignore-scripts + - name: Install dependencies + run: npm i --ignore-scripts - name: Run tests - run: | - npm test + run: npm test test-end2end: runs-on: ${{ matrix.os }} @@ -51,25 +74,33 @@ jobs: MONGO_INITDB_ROOT_PASSWORD: two steps: - - uses: actions/checkout@v3 + - name: Check out repo + uses: actions/checkout@v3 + with: + persist-credentials: false - - name: Use Node.js - uses: actions/setup-node@v3.2.0 + - name: Setup Node ${{ matrix.node-version }} + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - name: Install - run: | - npm install --ignore-scripts + - name: Install dependencies + run: npm i --ignore-scripts - name: Run tests - run: | - npm run test:end2end + run: npm run test:end2end automerge: + name: Automerge Dependabot PRs + if: > + github.event_name == 'pull_request' && + github.event.pull_request.user.login == 'dependabot[bot]' needs: [test, test-end2end] + permissions: + pull-requests: write + contents: write runs-on: ubuntu-latest steps: - - uses: fastify/github-action-merge-dependabot@v2.7.1 + - uses: fastify/github-action-merge-dependabot@v3 with: github-token: ${{ secrets.GITHUB_TOKEN }} From e88e4408115608210d13c631bb30620b15392faa Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Sun, 19 Jun 2022 18:21:23 +0100 Subject: [PATCH 4/4] ci: add name to test job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bcc268..411812f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: uses: actions/dependency-review-action@v1 test: + name: Test runs-on: ${{ matrix.os }} permissions: contents: read