From 85c53db9ba291af166aed82b8274e30f57d8b918 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Mon, 13 Feb 2023 09:09:42 +0000 Subject: [PATCH] chore: rename master branch to main --- .github/PULL_REQUEST_TEMPLATE/pull_request_template.md | 4 ++-- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- .github/workflows/link-check.yml | 4 ++-- CONTRIBUTING.md | 6 +++--- README.md | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index 0fde4ba..2dad92d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -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 diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d89f040..a94ccee 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -6,7 +6,7 @@ name: CD on: push: branches: - - master + - main # Allows this workflow to be run manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8682170..9b794d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,13 +6,13 @@ name: CI on: push: branches: - - master + - main paths-ignore: - "docs/**" - "*.md" pull_request: branches: - - master + - main paths-ignore: - "docs/**" - "*.md" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index de91356..d7b7292 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,10 +6,10 @@ name: CodeQL Analysis on: push: branches: - - master + - main pull_request: branches: - - master + - main paths: - "**/*.html" - "**/*.js" diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml index 5ecb7af..3ee60be 100644 --- a/.github/workflows/link-check.yml +++ b/.github/workflows/link-check.yml @@ -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" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6891dd0..83c1a56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: @@ -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 diff --git a/README.md b/README.md index f31f7be..7c00b11 100644 --- a/README.md +++ b/README.md @@ -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