Skip to content
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
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ the requirements below.

Bug fixes and new features should include tests.

Contributors guide: https://github.com/Fdawgs/fastify-json-to-xml/blob/master/CONTRIBUTING.md
Contributors guide: https://github.com/Fdawgs/fastify-json-to-xml/blob/main/CONTRIBUTING.md

-->

#### Checklist

- [ ] Run `npm test`
- [ ] Documentation has been updated and adheres to the style described in [CONTRIBUTING.md](https://github.com/Fdawgs/fastify-json-to-xml/blob/master/CONTRIBUTING.md#documentation-style)
- [ ] Documentation has been updated and adheres to the style described in [CONTRIBUTING.md](https://github.com/Fdawgs/fastify-json-to-xml/blob/main/CONTRIBUTING.md#documentation-style)
- [ ] Commit message adheres to the [Conventional commits](https://conventionalcommits.org/en/v1.0.0/) style, following the `@commitlint/config-conventional` config
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: CD
on:
push:
branches:
- master
- main
# Allows this workflow to be run manually from the Actions tab
workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ name: CI
on:
push:
branches:
- master
- main
paths-ignore:
- "docs/**"
- "*.md"
pull_request:
branches:
- master
- main
paths-ignore:
- "docs/**"
- "*.md"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: CodeQL Analysis
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
paths:
- "**/*.html"
- "**/*.js"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ name: Check Markdown for Broken Links
on:
push:
branches:
- master
- main
paths:
- "**/*.md"
- "!CHANGELOG.md"
pull_request:
branches:
- master
- main
paths:
- "**/*.md"
- "!CHANGELOG.md"
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Contributions are welcome and any help that can be offered is greatly appreciate
Please take a moment to read the entire contributing guide.

This repository uses the [Feature Branch Workflow](https://atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow),
meaning that development should take place in `feat/` branches, with the `master` branch kept in a stable state.
When you submit pull requests, please make sure to fork from and submit back to `master`.
meaning that development should take place in `feat/` branches, with the `main` branch kept in a stable state.
When you submit pull requests, please make sure to fork from and submit back to `main`.

Other processes and specifications that are in use in this repository are:

Expand Down Expand Up @@ -37,7 +37,7 @@ Titles and headings should use sentence-style capitalisation, where only the fir

Before submitting a pull request back to the main repository, please make sure you have completed the following steps:

1. Pull request base branch is set to `master`. All pull requests should be forked from and merged back to `master`
1. Pull request base branch is set to `main`. All pull requests should be forked from and merged back to `main`
2. Run `npm test` to check the code adheres to the defined ESLint style and that it passes the Jest tests
3. Run `npm run lint:prettier` to run the Prettier code formatter over the code
4. Run `npm run lint:licenses` if adding or updating production dependencies to check they use permissive licenses
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[![GitHub Release](https://img.shields.io/github/release/Fdawgs/fastify-json-to-xml.svg)](https://github.com/Fdawgs/fastify-json-to-xml/releases/latest/)
[![npm version](https://img.shields.io/npm/v/fastify-json-to-xml)](https://npmjs.com/package/fastify-json-to-xml)
![Build Status](https://github.com/Fdawgs/fastify-json-to-xml/workflows/CI/badge.svg?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/Fdawgs/fastify-json-to-xml/badge.svg?branch=master)](https://coveralls.io/github/Fdawgs/fastify-json-to-xml?branch=master)
![Build Status](https://github.com/Fdawgs/fastify-json-to-xml/workflows/CI/badge.svg?branch=main)
[![Coverage Status](https://coveralls.io/repos/github/Fdawgs/fastify-json-to-xml/badge.svg?branch=main)](https://coveralls.io/github/Fdawgs/fastify-json-to-xml?branch=main)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat)](https://github.com/prettier/prettier)

> Fastify plugin to serialise JSON responses into XML
Expand Down