Skip to content

Commit

Permalink
ci(root): 💚 use main branch instead of master
Browse files Browse the repository at this point in the history
  • Loading branch information
xavierfoucrier committed Apr 15, 2023
1 parent 178e7c3 commit edcd7d7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -106,27 +106,27 @@ workflows:
filters:
branches:
only:
- master
- main
- dev
- test:
requires:
- build
filters:
branches:
only:
- master
- main
- dev
- docs-build:
requires:
- test
filters:
branches:
only:
- master
- main
- dev
- docs-deploy:
requires:
- docs-build
filters:
branches:
only: master
only: main
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# barba.js <small>[v2]</small>

![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)

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"npmClient": "npm"
},
"version": {
"allowBranch": "master"
"allowBranch": "main"
}
},
"npmClient": "yarn",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit edcd7d7

Please sign in to comment.