Skip to content

Commit 61476ee

Browse files
committed
chore: change .github branches
1 parent e0e50ca commit 61476ee

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
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.
44

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

910
## Issue Reporting Guidelines
1011

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

2728
## Pull Request Guidelines
2829

29-
- Only code that's ready for release should be committed to the master branch. All development should be done in dedicated branches.
30-
- Checkout a **new** topic branch from master branch, and merge back against master branch.
30+
- Only code that's ready for release should be committed to the main branch. All development should be done in dedicated branches.
31+
- Checkout a **new** topic branch from main branch, and merge back against main branch.
3132
- Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
3233
- Make sure `npm test` passes.
3334
- If adding new feature:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ contact_links:
44
url: https://formilyjs.org/guide/issue-helper
55
about: The issue which is not created via https://formilyjs.org/guide/issue-helper will be closed immediately.
66
- name: ✨ Question Answer / Idea
7-
url: https://github.com/alibaba/formily/discussions/new
7+
url: https://github.com/formilyjs/vant/discussions/new
88
about: All questions can be solved here. At the same time you can provide all your ideas here.
99
- name: 📖 View documentation
1010
url: https://formilyjs.org

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_Before_ submitting a pull request, please make sure the following is done...
22

3-
- [ ] 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**.
4-
- [ ] Fork the repo and create your branch from `master` or `formily_next`.
3+
- [ ] Ensure the pull request title and commit message follow the [Commit Specific](https://github.com/formilyjs/vant/blob/main/.github/CONTRIBUTING.md#git-commit-specific) in **English**.
4+
- [ ] Fork the repo and create your branch from `main`.
55
- [ ] If you've added code that should be tested, add tests!
66
- [ ] If you've changed APIs, update the documentation.
77
- [ ] Ensure the test suite passes (`npm test`).

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Node CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
build:

.github/workflows/commitlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ name: Check Commit spec
66
on:
77
# Triggers the workflow on push or pull request events but only for the formily_next branch
88
push:
9-
branches: [master]
9+
branches: [main]
1010
pull_request:
11-
branches: [master]
11+
branches: [main]
1212

1313
# Allows you to run this workflow manually from the Actions tab
1414
workflow_dispatch:

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
branches:
6-
- formily_next
6+
- main
77
jobs:
88
release:
99
runs-on: ubuntu-latest
@@ -12,6 +12,7 @@ jobs:
1212
- uses: actions/checkout@v1
1313
with:
1414
fetch-depth: 0
15+
ref: main
1516
- uses: actions/setup-node@v1
1617
with:
1718
node-version: 12

0 commit comments

Comments
 (0)