Skip to content

Commit

Permalink
style: change branch master to main (#3)
Browse files Browse the repository at this point in the history
* style: change branch master to main
  • Loading branch information
zhouxinyong authored Dec 27, 2021
1 parent eccc60b commit fd377f3
Show file tree
Hide file tree
Showing 8 changed files with 1,250 additions and 42 deletions.
11 changes: 6 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

Hi! I’m really excited that you are interested in contributing to Formily. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines.

- [Issue Reporting Guidelines](#issue-reporting-guidelines)
- [Pull Request Guidelines](#pull-request-guidelines)
- [Git Commit Specific](./GIT_COMMIT_SPECIFIC.md)
- [Contributing Guide](#contributing-guide)
- [Issue Reporting Guidelines](#issue-reporting-guidelines)
- [Pull Request Guidelines](#pull-request-guidelines)
- [Git Commit Specific](#git-commit-specific)

## Issue Reporting Guidelines

Expand All @@ -26,8 +27,8 @@ Hi! I’m really excited that you are interested in contributing to Formily. Bef

## Pull Request Guidelines

- Only code that's ready for release should be committed to the master branch. All development should be done in dedicated branches.
- Checkout a **new** topic branch from master branch, and merge back against master branch.
- Only code that's ready for release should be committed to the main branch. All development should be done in dedicated branches.
- Checkout a **new** topic branch from main branch, and merge back against main branch.
- Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
- Make sure `npm test` passes.
- If adding new feature:
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_Before_ submitting a pull request, please make sure the following is done...

- [ ] Ensure the pull request title and commit message follow the [Commit Specific](https://github.com/alibaba/formily/blob/formily_next/.github/GIT_COMMIT_SPECIFIC.md) in **English**.
- [ ] Fork the repo and create your branch from `master` or `formily_next`.
- [ ] Fork the repo and create your branch from `main`.
- [ ] If you've added code that should be tested, add tests!
- [ ] If you've changed APIs, update the documentation.
- [ ] Ensure the test suite passes (`npm test`).
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Node CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Check Commit spec
on:
# Triggers the workflow on push or pull request events but only for the formily_next branch
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ English | [简体中文](./README.zh-CN.md)
<img src="https://img.shields.io/npm/dm/@formily/antdv"/>
<a href="https://www.npmjs.com/package/@formily/antdv"><img src="https://img.shields.io/npm/v/@formily/antdv.svg"></a>
<a href="https://codecov.io/gh/formilyjs/antdv">
<img src="https://codecov.io/gh/formilyjs/antdv/branch/master/graph/badge.svg?token=3V9RU8Wh9d"/>
<img src="https://codecov.io/gh/formilyjs/antdv/branch/main/graph/badge.svg?token=3V9RU8Wh9d"/>
</a>
<img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"/>
<a href="https://github.com/actions-cool/issues-helper">
Expand Down
4 changes: 2 additions & 2 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<img src="https://img.shields.io/npm/dm/@formily/antdv"/>
<a href="https://www.npmjs.com/package/@formily/antdv"><img src="https://img.shields.io/npm/v/@formily/antdv.svg"></a>
<a href="https://codecov.io/gh/formilyjs/antdv">
<img src="https://codecov.io/gh/formilyjs/antdv/branch/master/graph/badge.svg?token=3V9RU8Wh9d"/>
<img src="https://codecov.io/gh/formilyjs/antdv/branch/main/graph/badge.svg?token=3V9RU8Wh9d"/>
</a>
<img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg"/>
<a href="https://github.com/actions-cool/issues-helper">
Expand All @@ -18,7 +18,7 @@

## 概要

这是一个结合了 Formily & ant-design-vue的超酷组件库.
这是一个结合了 Formily & ant-design-vue 的超酷组件库.

## 特性

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
"eslint-plugin-promise": "^4.0.0",
"eslint-plugin-vue": "^7.20.0",
"ghooks": "^2.0.4",
"jest": "^27.4.5",
"jest-dom": "^4.0.0",
"lerna": "^4.0.0",
"less": "^4.1.2",
"less-loader": "^5.0.0",
Expand Down
Loading

0 comments on commit fd377f3

Please sign in to comment.