From edcd7d7e4292061f18b75ca77f12f2aea4093db9 Mon Sep 17 00:00:00 2001 From: Xavier Foucrier Date: Sat, 15 Apr 2023 23:50:41 +0200 Subject: [PATCH] ci(root): :green_heart: use `main` branch instead of `master` --- .circleci/config.yml | 10 +++++----- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- README.md | 6 +++--- lerna.json | 2 +- package.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e76471d..d19a3cab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ defaults: &defaults # Not working: Job \"build\" has filters configured in the job definition. These filters are incompatible with workflows. # branches: # only: - # - master + # - main jobs: build: @@ -106,7 +106,7 @@ workflows: filters: branches: only: - - master + - main - dev - test: requires: @@ -114,7 +114,7 @@ workflows: filters: branches: only: - - master + - main - dev - docs-build: requires: @@ -122,11 +122,11 @@ workflows: filters: branches: only: - - master + - main - dev - docs-deploy: requires: - docs-build filters: branches: - only: master + only: main diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c7aa1f1f..6c66d0d9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,7 +12,7 @@ assignees: '' ## Prerequisites - We realize there may be a lot of data requested here. We ask only that you do your best to provide as much information as possible so we can better help you. -- Read the [contributing guidelines](https://github.com/barbajs/barba/blob/master/.github/CONTRIBUTING.md). +- Read the [contributing guidelines](https://github.com/barbajs/barba/blob/main/.github/CONTRIBUTING.md). - Support questions are better asked in one of the following locations: - [Our chat](https://barbajs.slack.com) - [Stack Overflow](https://stackoverflow.com/questions/tagged/barbajs) diff --git a/README.md b/README.md index dbec52ef..b4a44abb 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # barba.js [v2] ![Stability](https://img.shields.io/badge/stability-stable-brightgreen.svg?style=flat-square) -[![CircleCI](https://img.shields.io/circleci/project/github/barbajs/barba/master.svg?style=flat-square)](https://circleci.com/gh/barbajs/barba/tree/master) -[![Coverage Status](https://img.shields.io/coveralls/github/barbajs/barba/master.svg?style=flat-square)](https://coveralls.io/github/barbajs/barba?branch=master) +[![CircleCI](https://img.shields.io/circleci/project/github/barbajs/barba/main.svg?style=flat-square)](https://circleci.com/gh/barbajs/barba/tree/main) +[![Coverage Status](https://img.shields.io/coveralls/github/barbajs/barba/main.svg?style=flat-square)](https://coveralls.io/github/barbajs/barba?branch=main) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square)](http://commitizen.github.io/cz-cli/) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg?style=flat-square)](https://conventionalcommits.org) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg?style=flat-square)](https://lernajs.io/) -[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat-square)](https://github.com/barbajs/barba/blob/master/LICENSE) +[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat-square)](https://github.com/barbajs/barba/blob/main/LICENSE) [![All Contributors](https://img.shields.io/badge/all_contributors-73-orange.svg?style=flat-square)](#contributors) [![Slack channel](https://img.shields.io/badge/slack-channel-purple.svg?style=flat-square&logo=slack)](https://barbajs.slack.com) diff --git a/lerna.json b/lerna.json index f80c1a80..7a174519 100644 --- a/lerna.json +++ b/lerna.json @@ -6,7 +6,7 @@ "npmClient": "npm" }, "version": { - "allowBranch": "master" + "allowBranch": "main" } }, "npmClient": "yarn", diff --git a/package.json b/package.json index e2751f26..dece2744 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "commit": "npx git-cz || exit 0", "commit-retry": "npx git-cz --retry || exit 0", "coverage": "cat ./coverage/lcov.info | coveralls", - "doc": "typedoc packages/**/src --tsconfig typedoc.json --sourcefile-url-prefix 'https://github.com/barbajs/barba/tree/master/'", + "doc": "typedoc packages/**/src --tsconfig typedoc.json --sourcefile-url-prefix 'https://github.com/barbajs/barba/tree/main/'", "lint": "tslint packages/**/src/**", "ls": "lerna ls", "prepublish": "yarn run build",