From a3b2e825961e05c3b9492744457aff292d7817c3 Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:06:25 -0500 Subject: [PATCH 1/2] Drop node <= 16 from workflows Add node 21 to benchmark-pr Add node 21 to ci-package-manager for yarn --- .github/workflows/plugins-benchmark-pr.yml | 28 +++++++++---------- .github/workflows/plugins-ci-mongo.yml | 2 +- .github/workflows/plugins-ci-mysql.yml | 2 +- .../workflows/plugins-ci-package-manager.yml | 9 ++---- .github/workflows/plugins-ci-postgres.yml | 2 +- .github/workflows/plugins-ci-redis.yml | 2 +- .github/workflows/plugins-ci.yml | 7 ++--- 7 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index 27ae202..38c8554 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -15,16 +15,16 @@ jobs: permissions: contents: read outputs: - PR-BENCH-16: ${{ steps.benchmark-pr.outputs.BENCH_RESULT_16 }} PR-BENCH-18: ${{ steps.benchmark-pr.outputs.BENCH_RESULT_18 }} PR-BENCH-20: ${{ steps.benchmark-pr.outputs.BENCH_RESULT_20 }} - DEFAULT-BENCH-16: ${{ steps.benchmark-default.outputs.BENCH_RESULT_16 }} + PR-BENCH-21: ${{ steps.benchmark-pr.outputs.BENCH_RESULT_21 }} DEFAULT-BENCH-18: ${{ steps.benchmark-default.outputs.BENCH_RESULT_18 }} DEFAULT-BENCH-20: ${{ steps.benchmark-default.outputs.BENCH_RESULT_20 }} + DEFAULT-BENCH-21: ${{ steps.benchmark-default.outputs.BENCH_RESULT_21 }} strategy: matrix: - node-version: [16, 18, 20] + node-version: [18, 20, 21] steps: - uses: actions/checkout@v4 with: @@ -65,7 +65,7 @@ jobs: echo 'EOF' >> $GITHUB_OUTPUT output-benchmark: - needs: + needs: - benchmark runs-on: ubuntu-latest permissions: @@ -76,36 +76,36 @@ jobs: with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} message: | - **Node**: 16 + **Node**: 18 **${{github.event.pull_request.head.ref}}**: ``` - ${{ needs.benchmark.outputs.PR-BENCH-16 }} + ${{ needs.benchmark.outputs.PR-BENCH-18 }} ``` **${{ github.event.repository.default_branch }}**: ``` - ${{ needs.benchmark.outputs.DEFAULT-BENCH-16 }} + ${{ needs.benchmark.outputs.DEFAULT-BENCH-18 }} ``` - + --- - **Node**: 18 + **Node**: 20 **${{github.event.pull_request.head.ref}}**: ``` - ${{ needs.benchmark.outputs.PR-BENCH-18 }} + ${{ needs.benchmark.outputs.PR-BENCH-20 }} ``` **${{ github.event.repository.default_branch }}**: ``` - ${{ needs.benchmark.outputs.DEFAULT-BENCH-18 }} + ${{ needs.benchmark.outputs.DEFAULT-BENCH-20 }} ``` --- - **Node**: 20 + **Node**: 21 **${{github.event.pull_request.head.ref}}**: ``` - ${{ needs.benchmark.outputs.PR-BENCH-20 }} + ${{ needs.benchmark.outputs.PR-BENCH-21 }} ``` **${{ github.event.repository.default_branch }}**: ``` - ${{ needs.benchmark.outputs.DEFAULT-BENCH-20 }} + ${{ needs.benchmark.outputs.DEFAULT-BENCH-21 }} ``` diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 75cc136..b8019cf 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -98,7 +98,7 @@ jobs: contents: read strategy: matrix: - node-version: [14, 16, 18, 20, 21] + node-version: [18, 20, 21] os: [ubuntu-latest] db: [5] diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 4df8419..1d0dd96 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -100,7 +100,7 @@ jobs: contents: read strategy: matrix: - node-version: [14, 16, 18, 20, 21] + node-version: [18, 20, 21] os: [ubuntu-latest] db: ['mysql:8.0'] diff --git a/.github/workflows/plugins-ci-package-manager.yml b/.github/workflows/plugins-ci-package-manager.yml index c54680b..a1c0db7 100644 --- a/.github/workflows/plugins-ci-package-manager.yml +++ b/.github/workflows/plugins-ci-package-manager.yml @@ -11,14 +11,9 @@ jobs: contents: read strategy: matrix: - node-version: [16, 18, 20, 21] + node-version: [18, 20, 21] os: [ubuntu-latest] pnpm-version: [8] - # pnpm@8 does not support Node.js 14 so include it separately - include: - - node-version: 14 - os: ubuntu-latest - pnpm-version: 7 steps: - name: Check out repo @@ -49,7 +44,7 @@ jobs: contents: read strategy: matrix: - node-version: [14, 16, 18, 20] + node-version: [18, 20, 21] os: [ubuntu-latest] steps: - name: Check out repo diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 6ea067f..a1d29ee 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -98,7 +98,7 @@ jobs: contents: read strategy: matrix: - node-version: [14, 16, 18, 20, 21] + node-version: [18, 20, 21] os: [ubuntu-latest] db: ['postgres:11-alpine'] diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index eb8acaa..458eeb3 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -96,7 +96,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [14, 16, 18, 20, 21] + node-version: [18, 20, 21] db: [5, 6, 7] services: redis: diff --git a/.github/workflows/plugins-ci.yml b/.github/workflows/plugins-ci.yml index b3881ce..5d1deb2 100644 --- a/.github/workflows/plugins-ci.yml +++ b/.github/workflows/plugins-ci.yml @@ -103,11 +103,8 @@ jobs: contents: read strategy: matrix: - node-version: [14, 16, 18, 20, 21] + node-version: [18, 20, 21] os: [macos-latest, ubuntu-latest, windows-latest] - exclude: - - os: windows-latest - node-version: 14 steps: - name: Check out repo uses: actions/checkout@v4 @@ -166,7 +163,7 @@ jobs: (needs.fastify-dependency-integration.result == 'success' || needs.fastify-dependency-integration.result == 'skipped') && github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' - needs: + needs: - test - fastify-dependency-integration permissions: From c738350721c3b6a156797f928d046b6a874299cb Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:20:44 -0500 Subject: [PATCH 2/2] Update readme with v4 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8048569..65f062c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ on: jobs: ci: - uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3 + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4 ``` Included in this repo is a [basic workflow](.github/workflows/plugins-ci.yml) for use across the majority of plugins, as well as variants with service containers. @@ -55,7 +55,7 @@ jobs: permissions: contents: write pull-requests: write - uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3 + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4 with: lint: true ```