Skip to content

Commit

Permalink
Merge branch 'main' into consistent-application-hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
Eomm committed May 18, 2024
2 parents 364f1d9 + 3ff1c54 commit c77c717
Show file tree
Hide file tree
Showing 259 changed files with 16,005 additions and 9,456 deletions.
18 changes: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,21 @@ updates:
schedule:
interval: "weekly"
open-pull-requests-limit: 10
groups:
# Production dependencies without breaking changes
dependencies:
dependency-type: "production"
update-types:
- "minor"
- "patch"
# Production dependencies with breaking changes
dependencies-major:
dependency-type: "production"
update-types:
- "major"
# Development dependencies
dev-dependencies:
dependency-type: "development"
ignore:
- dependency-name: tap
update-types: ["version-update:semver-major"]
9 changes: 6 additions & 3 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# PRs that only touch the docs folder
documentation:
- all: ["docs/**/*"]
- changed-files:
- any-glob-to-any-file: docs/**

"github actions":
- all: [".github/workflows/*"]
- changed-files:
- any-glob-to-any-file: ".github/workflows/*"

# PRs that only touch type files
typescript:
- all: ["**/*[.|-]d.ts"]
- changed-files:
- any-glob-to-any-file: "**/*[.|-]d.ts"

plugin:
- all: ["docs/Guides/Ecosystem.md"]
Expand Down
6 changes: 3 additions & 3 deletions .github/scripts/lint-ecosystem.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const path = require('path')
const fs = require('fs')
const readline = require('readline')
const path = require('node:path')
const fs = require('node:fs')
const readline = require('node:readline')

const basePathEcosystemDocFile = path.join('docs', 'Guides', 'Ecosystem.md')
const ecosystemDocFile = path.join(__dirname, '..', '..', basePathEcosystemDocFile)
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/benchmark-parser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ jobs:
permissions:
contents: read
outputs:
PR-BENCH-16: ${{ steps.benchmark-pr.outputs.BENCH_RESULT16 }}
PR-BENCH-18: ${{ steps.benchmark-pr.outputs.BENCH_RESULT18 }}
PR-BENCH-20: ${{ steps.benchmark-pr.outputs.BENCH_RESULT20 }}
MAIN-BENCH-16: ${{ steps.benchmark-main.outputs.BENCH_RESULT16 }}
PR-BENCH-22: ${{ steps.benchmark-pr.outputs.BENCH_RESULT22 }}
MAIN-BENCH-18: ${{ steps.benchmark-main.outputs.BENCH_RESULT18 }}
MAIN-BENCH-20: ${{ steps.benchmark-main.outputs.BENCH_RESULT20 }}
MAIN-BENCH-22: ${{ steps.benchmark-main.outputs.BENCH_RESULT22 }}
strategy:
matrix:
node-version: [16, 18, 20]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
ref: ${{github.event.pull_request.head.sha}}
repository: ${{github.event.pull_request.head.repo.full_name}}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Install
run: |
npm install --only=production --ignore-scripts
npm install --ignore-scripts
- name: Run benchmark
id: benchmark-pr
Expand All @@ -45,14 +45,14 @@ jobs:
echo 'EOF' >> $GITHUB_OUTPUT
# main benchmark
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
ref: 'main'

- name: Install
run: |
npm install --only=production --ignore-scripts
npm install --ignore-scripts
- name: Run benchmark
id: benchmark-main
Expand All @@ -64,7 +64,8 @@ jobs:
echo 'EOF' >> $GITHUB_OUTPUT
output-benchmark:
needs: [benchmark]
needs:
- benchmark
runs-on: ubuntu-latest
permissions:
pull-requests: write
Expand All @@ -74,12 +75,6 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
message: |
**Node**: 16
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-16 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-16 }}
---
**Node**: 18
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-18 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-18 }}
Expand All @@ -89,3 +84,9 @@ jobs:
**Node**: 20
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-20 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-20 }}
---
**Node**: 22
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-22 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-22 }}
39 changes: 21 additions & 18 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ jobs:
permissions:
contents: read
outputs:
PR-BENCH-16: ${{ steps.benchmark-pr.outputs.BENCH_RESULT16 }}
PR-BENCH-18: ${{ steps.benchmark-pr.outputs.BENCH_RESULT18 }}
PR-BENCH-20: ${{ steps.benchmark-pr.outputs.BENCH_RESULT20 }}
MAIN-BENCH-16: ${{ steps.benchmark-main.outputs.BENCH_RESULT16 }}
PR-BENCH-22: ${{ steps.benchmark-pr.outputs.BENCH_RESULT22 }}
MAIN-BENCH-18: ${{ steps.benchmark-main.outputs.BENCH_RESULT18 }}
MAIN-BENCH-20: ${{ steps.benchmark-main.outputs.BENCH_RESULT20 }}
MAIN-BENCH-22: ${{ steps.benchmark-main.outputs.BENCH_RESULT22 }}
strategy:
matrix:
node-version: [16, 18, 20]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
ref: ${{github.event.pull_request.head.sha}}
repository: ${{github.event.pull_request.head.repo.full_name}}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Install
run: |
npm install --only=production --ignore-scripts
npm install --ignore-scripts
- name: Run benchmark
id: benchmark-pr
Expand All @@ -45,14 +45,14 @@ jobs:
echo 'EOF' >> $GITHUB_OUTPUT
# main benchmark
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
ref: 'main'

- name: Install
run: |
npm install --only=production --ignore-scripts
npm install --ignore-scripts
- name: Run benchmark
id: benchmark-main
Expand All @@ -64,7 +64,8 @@ jobs:
echo 'EOF' >> $GITHUB_OUTPUT
output-benchmark:
needs: [benchmark]
needs:
- benchmark
runs-on: ubuntu-latest
permissions:
pull-requests: write
Expand All @@ -74,12 +75,6 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
message: |
**Node**: 16
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-16 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-16 }}
---
**Node**: 18
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-18 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-18 }}
Expand All @@ -90,19 +85,27 @@ jobs:
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-20 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-20 }}
---
**Node**: 22
**PR**: ${{ needs.benchmark.outputs.PR-BENCH-22 }}
**MAIN**: ${{ needs.benchmark.outputs.MAIN-BENCH-22 }}
remove-label:
if: "always()"
needs:
if: ${{ github.event.label.name == 'benchmark' }}
needs:
- benchmark
- output-benchmark
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Remove benchmark label
uses: octokit/request-action@v2.x
id: remove-label
with:
route: DELETE /repos/{repo}/issues/{issue_number}/labels/{name}
repo: ${{ github.event.pull_request.head.repo.full_name }}
repo: ${{ github.repository }}
issue_number: ${{ github.event.pull_request.number }}
name: benchmark
env:
Expand Down
127 changes: 127 additions & 0 deletions .github/workflows/ci-alternative-runtime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
name: ci Alternative Runtimes

on:
push:
branches:
- main
- next
- 'v*'
paths-ignore:
- 'docs/**'
- '*.md'
pull_request:
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:
test-unit:
runs-on: ${{ matrix.os }}
permissions:
contents: read
strategy:
matrix:
node-version: [18, 20]
os: [macos-latest, ubuntu-latest, windows-latest]
include:
- runtime: nsolid
node-version: 18
nsolid-version: 5
- runtime: nsolid
node-version: 20
nsolid-version: 5
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- uses: nodesource/setup-nsolid@v1
if: ${{ matrix.runtime == 'nsolid' }}
with:
node-version: ${{ matrix.node-version }}
nsolid-version: ${{ matrix.nsolid-version }}

- name: Install
run: |
npm install --ignore-scripts
- name: Run tests
run: |
npm run unit
test-typescript:
runs-on: 'ubuntu-latest'
permissions:
contents: read

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- uses: nodesource/setup-nsolid@v1
with:
node-version: 20
nsolid-version: 5

- name: Install
run: |
npm install --ignore-scripts
- name: Run typescript tests
run: |
npm run test:typescript
env:
NODE_OPTIONS: no-network-family-autoselection

package:
needs:
- test-typescript
- test-unit
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: nodesource/setup-nsolid@v1
with:
nsolid-version: 5
- name: install fastify
run: |
npm install --ignore-scripts
- name: install webpack stack
run: |
cd test/bundler/webpack && npm install
- name: Test webpack bundle
run: |
cd test/bundler/webpack && npm run test
- name: install esbuild stack
run: |
cd test/bundler/esbuild && npm install
- name: Test esbuild bundle
run: |
cd test/bundler/esbuild && npm run test
automerge:
if: >
github.event_name == 'pull_request' &&
github.event.pull_request.user.login == 'dependabot[bot]'
needs:
- test-typescript
- test-unit
- package
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: write
steps:
- uses: fastify/github-action-merge-dependabot@v3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit c77c717

Please sign in to comment.