diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7413516..c72187d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,15 +2,21 @@ I want to thank you for sparing a time to improve this project! Here are some guidelines for contributingļ¼š -To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a `Feature Request` type issue to discuss whether your idea fits the project. +To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a [`Feature Request`](https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md) issue to discuss whether your idea fits the project. Generally, contribute to the project by: -1. Fork this project. -2. Create a new branch `my-new-feature`(or `fix-a-bug`), then complete the development, commit and push. -3. Submit a new `Pull Request`. +1. Fork this project on GitHub and clone it locally. +2. Create a new branch named `feature/my-feature` (or `feature/fix-a-bug`), which branch from `develop`: + ```console + $ git checkout -b feature/ develop + ``` + > Please note that the new branch name must include the prefix `feature/`. + +3. After completing the development, commit and push to remote. +4. Submit a new **pull request** to the `develop` branch of upstream, i.e., `cotes2020/jekyll-theme-chirpy:develop`. --- -:tada:Your volunteering will make the open source world more beautiful, thanks again!:tada: \ No newline at end of file +:tada: Your volunteering will make the open source world more beautiful, thanks again! :tada: \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index dd4f25b..f06a4ea 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -11,7 +11,7 @@ labels: enhancement - [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md). - [ ] There are no similar request on existing issues (including closed ones). - [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project. -- [ ] I was in the `master` branch of the latest code. +- [ ] I was in the `develop` branch of the latest code. ## Is your feature request related to a problem? Please describe diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index a45ac0b..7a21b07 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -7,16 +7,14 @@ labels: question ## Checklist + + - [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design. - [ ] There are no similar question on existing issues (including closed ones). - [ ] I searched the Internet for related problems, but still couldn't solve it. - [ ] My question is based on the latest code of `master` branch. -## I don't understand what the ReadMe/Wiki says - - - -## I have other questions +## Description \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0035b60..9755732 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,6 @@ name: 'Continuous Integration' on: push: - branches-ignore: - - stable tags-ignore: - '*' paths-ignore: diff --git a/.travis.yml b/.travis.yml index db6c373..fb5b3ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - bash _cibuild.sh branches: - only: stable + only: master git: depth: false # for posts lastmod