Skip to content

chore: rename master to main #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
outputs:
PR-BENCH: ${{ steps.benchmark-pr.outputs.BENCH_RESULT }}
MASTER-BENCH: ${{ steps.benchmark-master.outputs.BENCH_RESULT }}
MAIN-BENCH: ${{ steps.benchmark-main.outputs.BENCH_RESULT }}
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -38,17 +38,17 @@ jobs:
content="${content//$'\r'/'%0D'}"
echo "::set-output name=BENCH_RESULT::$content"

# master benchmark
# main benchmark
- uses: actions/checkout@v4
with:
ref: 'master'
ref: 'main'

- name: Install
run: |
npm install --ignore-scripts

- name: Run benchmark
id: benchmark-master
id: benchmark-main
run: |
npm run --silent bench > ./bench-result
content=$(cat ./bench-result)
Expand All @@ -73,9 +73,9 @@ jobs:
```
${{ needs.benchmark.outputs.PR-BENCH }}
```
**MASTER**:
**MAIN**:
```
${{ needs.benchmark.outputs.MASTER-BENCH }}
${{ needs.benchmark.outputs.MAIN-BENCH }}
```

- uses: actions-ecosystem/action-remove-labels@v1
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- master
- next
- 'v*'
paths-ignore:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# fast-json-stringify

[![CI](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml)
[![CI](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml)
[![NPM version](https://img.shields.io/npm/v/fast-json-stringify.svg?style=flat)](https://www.npmjs.com/package/fast-json-stringify)
[![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
[![NPM downloads](https://img.shields.io/npm/dm/fast-json-stringify.svg?style=flat)](https://www.npmjs.com/package/fast-json-stringify)
Expand Down
2 changes: 1 addition & 1 deletion benchmark/bench-cmp-branch.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const simpleGit = require('simple-git')
const git = simpleGit(process.cwd())

const COMMAND = 'npm run bench'
const DEFAULT_BRANCH = 'master'
const DEFAULT_BRANCH = 'main'
const PERCENT_THRESHOLD = 5
const greyColor = '\x1b[30m'
const redColor = '\x1b[31m'
Expand Down
2 changes: 1 addition & 1 deletion test/json-schema-test-suite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ It contains a set of JSON objects that implementors of JSON Schema validation li

# How to add another test case?

1. Navigate to [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/master/tests)
1. Navigate to [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/main/tests)
2. Choose a draft `draft4`, `draft6` or `draft7`
3. Copy & paste the `test-case.json` to the project and add a test like in the `draft4.test.js`