From 8fb9fd2b38b218bbb504ed4339920408e1455b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 15 Apr 2024 20:36:51 +0200 Subject: [PATCH 1/6] npmup --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e55459e..d9410a8 100644 --- a/package.json +++ b/package.json @@ -42,18 +42,18 @@ ] }, "devDependencies": { - "@fastify/pre-commit": "^2.0.2", - "ajv": "^8.0.0", + "@fastify/pre-commit": "^2.1.0", + "ajv": "^8.12.0", "ajv-formats": "^3.0.1", - "jest": "^29.0.1", - "jsdoc-to-markdown": "^8.0.0", + "jest": "^29.7.0", + "jsdoc-to-markdown": "^8.0.1", "lodash.merge": "^4.6.2", "snazzy": "^9.0.0", - "standard": "^17.0.0", + "standard": "^17.1.0", "tsd": "^0.31.0" }, "dependencies": { - "@fastify/deepmerge": "^1.1.0" + "@fastify/deepmerge": "^1.3.0" }, "pre-commit": [ "lint", From 6467626b04f7cb02d204bc78b8f3e8464cbd5541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 15 Apr 2024 20:38:11 +0200 Subject: [PATCH 2/6] update ci --- .github/workflows/ci.yml | 87 +++------------------------------------- 1 file changed, 6 insertions(+), 81 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66acfb7..5395d92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: ci +name: CI on: push: @@ -15,84 +15,9 @@ on: - '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@v4 - with: - persist-credentials: false - - - name: Dependency review - uses: actions/dependency-review-action@v4 - - build: - runs-on: ${{ matrix.os }} - - permissions: - contents: read - - strategy: - matrix: - node-version: [14, 16, 18, 20] - os: [macos-latest, ubuntu-latest, windows-latest] - exclude: - - os: windows-latest - node-version: 14 - - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - run: | - npm install --ignore-scripts - npm run build --if-present - npm run test - - name: Coveralls Parallel - uses: coverallsapp/github-action@v2.2.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - parallel: true - flag-name: run-${{ matrix.node-version }}-${{ matrix.os }} - - coverage: - name: Aggregate Coverage Calculations - needs: build - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: Coveralls Finished - uses: coverallsapp/github-action@v2.2.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true - - automerge: - name: Automatically merge Dependabot pull requests - if: > - github.event_name == 'pull_request' && - github.event.pull_request.user.login == 'dependabot[bot]' - needs: build - runs-on: ubuntu-latest - permissions: - pull-requests: write - contents: write - steps: - - uses: fastify/github-action-merge-dependabot@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} + test: + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.1.0 + with: + license-check: true + lint: true From 8d8736796d47cbe9419f5909ac2ce35f239a173c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Fri, 19 Apr 2024 12:13:45 +0200 Subject: [PATCH 3/6] use library workflow --- .github/workflows/ci.yml | 122 +++++++++++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5395d92..441f392 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,21 +3,119 @@ name: CI on: push: branches: - - main - - master - - next - - 'v*' + - main + - master + - next + - "v*" paths-ignore: - - 'docs/**' - - '*.md' + - "docs/**" + - "*.md" pull_request: paths-ignore: - - 'docs/**' - - '*.md' + - "docs/**" + - "*.md" 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@v4 + with: + persist-credentials: false + + - name: Dependency review + uses: actions/dependency-review-action@v4 + + lint: + name: Lint Code + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: lts/* + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: Lint code + run: npm run lint + test: - uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.1.0 - with: - license-check: true - lint: true + name: Test + runs-on: ubuntu-latest + permissions: + contents: read + strategy: + matrix: + node-version: [10, 12, 14, 16, 18, 20] + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Upgrade npm + if: ${{ success() && matrix.node-version == '6' }} + run: npm i npm@6.13.4 -g + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: Run tests + run: npm run test:unit + + typescript: + name: Test TypeScript + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: lts/* + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: tsd + run: npm run test:typescript + + automerge: + name: Automerge Dependabot PRs + if: > + github.event_name == 'pull_request' && + github.event.pull_request.user.login == 'dependabot[bot]' + needs: [lint, test, typescript] + permissions: + pull-requests: write + contents: write + runs-on: ubuntu-latest + steps: + - uses: fastify/github-action-merge-dependabot@v3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + target: major From 7ddc892f2a7dd255aaba7eb2434dec0412625e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Fri, 19 Apr 2024 12:15:51 +0200 Subject: [PATCH 4/6] start from 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 441f392..caab773 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: contents: read strategy: matrix: - node-version: [10, 12, 14, 16, 18, 20] + node-version: [14, 16, 18, 20] steps: - name: Check out repo uses: actions/checkout@v4 From 05f99f94a434e2fbdef966247ad67f53706d4d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Fri, 19 Apr 2024 14:15:43 +0200 Subject: [PATCH 5/6] use workflow@3 --- .github/workflows/ci.yml | 122 ++++----------------------------------- 1 file changed, 12 insertions(+), 110 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index caab773..7b00276 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,119 +3,21 @@ name: CI on: push: branches: - - main - - master - - next - - "v*" + - main + - master + - next + - 'v*' paths-ignore: - - "docs/**" - - "*.md" + - 'docs/**' + - '*.md' pull_request: paths-ignore: - - "docs/**" - - "*.md" + - 'docs/**' + - '*.md' 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@v4 - with: - persist-credentials: false - - - name: Dependency review - uses: actions/dependency-review-action@v4 - - lint: - name: Lint Code - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: Check out repo - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: lts/* - - - name: Install dependencies - run: npm i --ignore-scripts - - - name: Lint code - run: npm run lint - test: - name: Test - runs-on: ubuntu-latest - permissions: - contents: read - strategy: - matrix: - node-version: [14, 16, 18, 20] - steps: - - name: Check out repo - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: Setup Node ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Upgrade npm - if: ${{ success() && matrix.node-version == '6' }} - run: npm i npm@6.13.4 -g - - - name: Install dependencies - run: npm i --ignore-scripts - - - name: Run tests - run: npm run test:unit - - typescript: - name: Test TypeScript - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: Check out repo - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: lts/* - - - name: Install dependencies - run: npm i --ignore-scripts - - - name: tsd - run: npm run test:typescript - - automerge: - name: Automerge Dependabot PRs - if: > - github.event_name == 'pull_request' && - github.event.pull_request.user.login == 'dependabot[bot]' - needs: [lint, test, typescript] - permissions: - pull-requests: write - contents: write - runs-on: ubuntu-latest - steps: - - uses: fastify/github-action-merge-dependabot@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - target: major + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3 + with: + license-check: true + lint: true From df6a5a4b14455c61999bb0103d2e32b19bb0daf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Fri, 19 Apr 2024 14:17:31 +0200 Subject: [PATCH 6/6] Revert "use workflow@3" This reverts commit 05f99f94a434e2fbdef966247ad67f53706d4d32. --- .github/workflows/ci.yml | 122 +++++++++++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b00276..caab773 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,21 +3,119 @@ name: CI on: push: branches: - - main - - master - - next - - 'v*' + - main + - master + - next + - "v*" paths-ignore: - - 'docs/**' - - '*.md' + - "docs/**" + - "*.md" pull_request: paths-ignore: - - 'docs/**' - - '*.md' + - "docs/**" + - "*.md" 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@v4 + with: + persist-credentials: false + + - name: Dependency review + uses: actions/dependency-review-action@v4 + + lint: + name: Lint Code + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: lts/* + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: Lint code + run: npm run lint + test: - uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3 - with: - license-check: true - lint: true + name: Test + runs-on: ubuntu-latest + permissions: + contents: read + strategy: + matrix: + node-version: [14, 16, 18, 20] + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Upgrade npm + if: ${{ success() && matrix.node-version == '6' }} + run: npm i npm@6.13.4 -g + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: Run tests + run: npm run test:unit + + typescript: + name: Test TypeScript + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Check out repo + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: lts/* + + - name: Install dependencies + run: npm i --ignore-scripts + + - name: tsd + run: npm run test:typescript + + automerge: + name: Automerge Dependabot PRs + if: > + github.event_name == 'pull_request' && + github.event.pull_request.user.login == 'dependabot[bot]' + needs: [lint, test, typescript] + permissions: + pull-requests: write + contents: write + runs-on: ubuntu-latest + steps: + - uses: fastify/github-action-merge-dependabot@v3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + target: major