Skip to content

Commit

Permalink
fix: change config to main (#1924)
Browse files Browse the repository at this point in the history
  • Loading branch information
burakukula committed Mar 3, 2022
1 parent 2b6d93c commit 89c6faf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@ workflows:
filters:
branches:
only:
- master
- main
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 5
target-branch: master
target-branch: main
labels:
- dependencies
commit-message:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1><img src="./forma-icon.svg" height="24"> Forma 36 - The Contentful Design System</h1>

[![Contentful](https://circleci.com/gh/contentful/forma-36.svg?style=shield)](https://circleci.com/gh/contentful/forma-36)
[![All Contributors](https://img.shields.io/github/all-contributors/contentful/forma-36/master)](#contributors-)
[![All Contributors](https://img.shields.io/github/all-contributors/contentful/forma-36/main)](#contributors-)
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)

[Forma 36](https://f36.contentful.com/) is an open-source design system by [Contentful](https://www.contentful.com) created with the intent to reduce the overhead of creating UI by providing tools and guidance for digital teams building and extending Contentful products
Expand Down Expand Up @@ -42,7 +42,7 @@ We use storybook with our react component library to develop components. You can

## Commits & releases

Use `yarn commit`. This uses the [Commitzen](https://github.com/commitizen/cz-cli) CLI to create a conventional commit message based on your changes. CI is setup to release all new commits on the master branch.
Use `yarn commit`. This uses the [Commitzen](https://github.com/commitizen/cz-cli) CLI to create a conventional commit message based on your changes. CI is setup to release all new commits on the main branch.

## Testing with your own project locally

Expand Down
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"useWorkspaces": true,
"command": {
"version": {
"allowBranch": ["master"],
"allowBranch": ["main"],
"conventionalCommits": true,
"message": "chore(release): updated release notes and package versions [ci skip]",
"ignoreChanges": [
Expand All @@ -20,7 +20,7 @@
]
},
"publish": {
"allowBranch": ["master"]
"allowBranch": ["main"]
}
}
}

0 comments on commit 89c6faf

Please sign in to comment.