Skip to content

Commit 36f9f4d

Browse files
authored
Merge pull request #282 from semantic-release-plus/merge-upstream-20220108
Merge-upstream-20220108
2 parents a61f330 + b302235 commit 36f9f4d

27 files changed

+155
-129
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ jobs:
6363
cache: npm
6464
# run npm link to install current directory globally this is similar to `sudo npm install -g semantic-release`
6565
# we need to eat our own dog food not our previously published version
66-
- run: sudo npm link
66+
- run: npm ci --ignore-scripts
67+
- run: sudo npm link --ignore-scripts
6768
- run: npx semantic-release-plus
6869
env:
6970
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,55 @@ Help us keep **semantic-release** open and inclusive. Please read and follow our
2121

2222
### Improve documentation
2323

24-
As a **semantic-release** user, you are the perfect candidate to help us improve our documentation: typo corrections, clarifications, more examples, new [recipes](docs/recipes/README.md), etc. Take a look at the [documentation issues that need help](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3A%22help+wanted%22+label%3Adocs+).
24+
As a **semantic-release** user, you are the perfect candidate to help us improve our documentation: typo corrections, clarifications, more examples, new [recipes](docs/recipes), etc. Take a look at the [documentation issues that need help](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3A%22help+wanted%22+label%3Adocs+).
2525

2626
Please follow the [Documentation guidelines](#documentation).
2727

2828
### Give feedback on issues
2929

30-
Some issues are created without information requested in the [Bug report guideline](#bug-report). Help make them easier to resolve by adding any relevant information.
30+
Some issues are created without information requested in the [Bug report guideline](#bug-report).
31+
Help make them easier to resolve by adding any relevant information.
3132

32-
Issues with the [design label](https://github.com/issues?q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3Adesign) are meant to discuss the implementation of new features. Participating in the discussion is a good opportunity to get involved and influence the future direction of **semantic-release**.
33+
Issues with the [design label](https://github.com/issues?q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3Adesign) are meant to discuss the implementation of new features.
34+
Participating in the discussion is a good opportunity to get involved and influence the future direction of **semantic-release**.
3335

3436
### Fix bugs and implement features
3537

36-
Confirmed bugs and ready-to-implement features are marked with the [help wanted label](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3A%22help+wanted%22). Post a comment on an issue to indicate you would like to work on it and to request help from the [@semantic-release/maintainers](https://github.com/orgs/semantic-release/teams/contributors) and the community.
38+
Confirmed bugs and ready-to-implement features are marked with the [help wanted label](https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+user%3Asemantic-release+archived%3Afalse+label%3A%22help+wanted%22).
39+
Post a comment on an issue to indicate you would like to work on it and to request help from the [@semantic-release/maintainers](https://github.com/orgs/semantic-release/teams/contributors) and the community.
3740

3841
## Using the issue tracker
3942

40-
The issue tracker is the channel for [bug reports](#bug-report), [features requests](#feature-request) and [submitting pull requests](#submitting-a-pull-request) only. Please use the [Support](docs/support/README.md) and [Get help](README.md#get-help) sections for support, troubleshooting and questions.
43+
The issue tracker is the channel for [bug reports](#bug-report), [features requests](#feature-request) and [submitting pull requests](#submitting-a-pull-request) only.
44+
Please use the [Support](docs/support/README.md) and [Get help](README.md#get-help) sections for support, troubleshooting and questions.
4145

4246
Before opening an issue or a Pull Request, please use the [GitHub issue search](https://github.com/issues?utf8=%E2%9C%93&q=user%3Asemantic-release) to make sure the bug or feature request hasn't been already reported or fixed.
4347

4448
### Bug report
4549

46-
A good bug report shouldn't leave others needing to chase you for more information. Please try to be as detailed as possible in your report and fill the information requested in the [Bug report template](https://github.com/semantic-release/semantic-release/issues/new?template=bug-report.md).
50+
A good bug report shouldn't leave others needing to chase you for more information.
51+
Please try to be as detailed as possible in your report and fill the information requested in the [bug report template](https://github.com/semantic-release/semantic-release/issues/new?template=01_bug_report.md).
4752

4853
### Feature request
4954

50-
Feature requests are welcome, but take a moment to find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible and fill the information requested in the [Feature request template](https://github.com/semantic-release/semantic-release/issues/new?template=feature-request.md).
55+
Feature requests are welcome, but take a moment to find out whether your idea fits with the scope and aims of the project.
56+
It's up to you to make a strong case to convince the project's developers of the merits of this feature.
57+
Please provide as much detail and context as possible and fill the information requested in the [feature request template](https://github.com/semantic-release/semantic-release/issues/new?template=02_feature_request.md).
5158

5259
### New plugin request
5360

54-
[Plugins](docs/usage/plugins.md) are a great way to extend **semantic-release** capabilities, integrate with other systems and support new project type. Please provide as much detail and context as possible and fill the information requested in the [New plugin request template](https://github.com/semantic-release/semantic-release/issues/new?template=plugin-request.md).
61+
[Plugins](docs/usage/plugins.md) are a great way to extend **semantic-release** capabilities, integrate with other systems and support new project type.
62+
Please provide as much detail and context as possible and fill the information requested in the [plugin suggestion template](https://github.com/semantic-release/semantic-release/issues/new?template=03_plugin_suggestion.md).
5563

5664
## Submitting a Pull Request
5765

58-
Good pull requests, whether patches, improvements, or new features, are a fantastic help. They should remain focused in scope and avoid containing unrelated commits.
66+
Good pull requests, whether patches, improvements, or new features, are a fantastic help.
67+
They should remain focused in scope and avoid containing unrelated commits.
5968

60-
**Please ask first** before embarking on any significant pull requests (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
69+
**Please ask first** before embarking on any significant pull requests (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that the project's maintainers might not want to merge into the project.
6170

62-
If you have never created a pull request before, welcome 🎉 😄. [Here is a great tutorial](https://opensource.guide/how-to-contribute/#opening-a-pull-request) on how to send one :)
71+
If you have never created a pull request before, welcome 🎉 😄.
72+
[Here is a great tutorial](https://opensource.guide/how-to-contribute/#opening-a-pull-request) on how to send one :)
6373

6474
Here is a summary of the steps to follow:
6575

@@ -91,7 +101,9 @@ $ git push origin <topic-branch-name>
91101
**Tips**:
92102

93103
- For ambitious tasks, open a Pull Request as soon as possible with the `[WIP]` prefix in the title, in order to get feedback and help from the community.
94-
- [Allow semantic-release maintainers to make changes to your Pull Request branch](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork). This way, we can rebase it and make some minor changes if necessary. All changes we make will be done in new commit and we'll ask for your approval before merging them.
104+
- [Allow semantic-release maintainers to make changes to your Pull Request branch](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork).
105+
This way, we can rebase it and make some minor changes if necessary.
106+
All changes we make will be done in new commit, and we'll ask for your approval before merging them.
95107

96108
## Coding rules
97109

@@ -140,7 +152,8 @@ A complex feature can be broken down into multiple commits as long as each one m
140152

141153
#### Commit message format
142154

143-
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes a **type**, a **scope** and a **subject**:
155+
Each commit message consists of a **header**, a **body** and a **footer**.
156+
The header has a special format that includes a **type**, a **scope** and a **subject**:
144157

145158
```commit
146159
<type>(<scope>): <subject>
@@ -156,7 +169,8 @@ The **footer** can contain a [closing reference to an issue](https://help.github
156169

157170
#### Revert
158171

159-
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
172+
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit.
173+
In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
160174

161175
#### Type
162176

@@ -191,7 +205,8 @@ The body should include the motivation for the change and contrast this with pre
191205

192206
The footer should contain any information about **Breaking Changes** and is also the place to reference GitHub issues that this commit **Closes**.
193207

194-
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
208+
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
209+
The rest of the commit message is then used for this.
195210

196211
#### Examples
197212

@@ -232,7 +247,8 @@ $ npm install
232247

233248
### Lint
234249

235-
All the [semantic-release](https://github.com/semantic-release) repositories use [XO](https://github.com/sindresorhus/xo) for linting and [Prettier](https://prettier.io) for formatting. Prettier formatting will be automatically verified and fixed by XO.
250+
All the [semantic-release](https://github.com/semantic-release) repositories use [XO](https://github.com/sindresorhus/xo) for linting and [Prettier](https://prettier.io) for formatting.
251+
Prettier formatting will be automatically verified and fixed by XO.
236252

237253
Before pushing your code changes make sure there are no linting errors with `npm run lint`.
238254

README.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ This removes the immediate connection between human emotions and version numbers
5050
- Notify maintainers and users of new releases
5151
- Use formalized commit message convention to document changes in the codebase
5252
- Publish on different distribution channels (such as [npm dist-tags](https://docs.npmjs.com/cli/dist-tag)) based on git merges
53-
- Integrate with your [continuous integration workflow](docs/recipes/README.md#ci-configurations)
53+
- Integrate with your [continuous integration workflow](docs/recipes/release-workflow/README.md#ci-configurations)
5454
- Avoid potential errors associated with manual releases
55-
- Support any [package managers and languages](docs/recipes/README.md#package-managers-and-languages) via [plugins](docs/usage/plugins.md)
55+
- Support any [package managers and languages](docs/recipes/release-workflow/README.md#package-managers-and-languages) via [plugins](docs/usage/plugins.md)
5656
- Simple and reusable configuration via [shareable configurations](docs/usage/shareable-configurations.md)
5757

5858
## How does it work?
@@ -69,11 +69,11 @@ Tools such as [commitizen](https://github.com/commitizen/cz-cli) or [commitlint]
6969

7070
The table below shows which commit message gets you which release type when `semantic-release` runs (using the default configuration):
7171

72-
| Commit message | Release type |
73-
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------- |
74-
| `fix(pencil): stop graphite breaking when too much pressure applied` | ~~Patch~~ Fix Release |
75-
| `feat(pencil): add 'graphiteWidth' option` | ~~Minor~~ Feature Release |
76-
| `perf(pencil): remove graphiteWidth option`<br><br>`BREAKING CHANGE: The graphiteWidth option has been removed.`<br>`The default graphite width of 10mm is always used for performance reasons.` | ~~Major~~ Breaking Release |
72+
| Commit message | Release type |
73+
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------- |
74+
| `fix(pencil): stop graphite breaking when too much pressure applied` | ~~Patch~~ Fix Release |
75+
| `feat(pencil): add 'graphiteWidth' option` | ~~Minor~~ Feature Release |
76+
| `perf(pencil): remove graphiteWidth option`<br><br>`BREAKING CHANGE: The graphiteWidth option has been removed.`<br>`The default graphite width of 10mm is always used for performance reasons.` | ~~Major~~ Breaking Release <br /> (Note that the `BREAKING CHANGE: ` token must be in the footer of the commit) |
7777

7878
### Automation with CI
7979

@@ -87,9 +87,9 @@ For each new commit added to one of the release branches (for example: `master`,
8787
**semantic-release** offers various ways to control the timing, the content and the audience of published releases.
8888
See example workflows in the following recipes:
8989

90-
- [Using distribution channels](docs/recipes/distribution-channels.md#publishing-on-distribution-channels)
91-
- [Maintenance releases](docs/recipes/maintenance-releases.md#publishing-maintenance-releases)
92-
- [Pre-releases](docs/recipes/pre-releases.md#publishing-pre-releases)
90+
- [Using distribution channels](docs/recipes/release-workflow/distribution-channels.md#publishing-on-distribution-channels)
91+
- [Maintenance releases](docs/recipes/release-workflow/maintenance-releases.md#publishing-maintenance-releases)
92+
- [Pre-releases](docs/recipes/release-workflow/pre-releases.md#publishing-pre-releases)
9393

9494
### Release steps
9595

@@ -130,10 +130,9 @@ In order to use **semantic-release** you need:
130130
- [Plugins](docs/extending/plugins-list.md)
131131
- [Shareable configuration](docs/extending/shareable-configurations-list.md)
132132
- Recipes
133-
- [CI configurations](docs/recipes/README.md)
134-
- [Git hosted services](docs/recipes/README.md)
135-
- [Release workflow](docs/recipes/README.md)
136-
- [Package managers and languages](docs/recipes/README.md)
133+
- [CI configurations](docs/recipes/ci-configurations/README.md)
134+
- [Git hosted services](docs/recipes/git-hosted-services/README.md)
135+
- [Release workflow](docs/recipes/release-workflow/README.md)
137136
- Developer guide
138137
- [JavaScript API](docs/developer-guide/js-api.md)
139138
- [Plugins development](docs/developer-guide/plugin.md)
@@ -153,12 +152,12 @@ In order to use **semantic-release** you need:
153152

154153
## Badge
155154

156-
Let people know that your package is published using **semantic-release** by including this badge in your readme.
155+
Let people know that your package is published using **semantic-release** and which [commit-convention](#commit-message-format) is followed by including this badge in your readme.
157156

158-
[![semantic-release](https://img.shields.io/badge/semantic-release-e10079.svg?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
157+
[![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
159158

160159
```md
161-
[![semantic-release](https://img.shields.io/badge/semantic-release-e10079.svg?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
160+
[![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
162161
```
163162

164163
## Contributors ✨

SUMMARY.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@
1919

2020
## Recipes
2121

22-
- [CI configurations](docs/recipes/README.md#ci-configurations)
23-
- [CircleCI 2.0](docs/recipes/circleci-workflows.md)
24-
- [Travis CI](docs/recipes/travis.md)
25-
- [GitLab CI](docs/recipes/gitlab-ci.md)
26-
- [GitHub Actions](docs/recipes/github-actions.md)
27-
- [Jenkins CI](docs/recipes/jenkins-ci.md)
28-
- [Git hosted services](docs/recipes/README.md#git-hosted-services)
29-
- [Git authentication with SSH keys](docs/recipes/git-auth-ssh-keys.md)
30-
- [Release Workflow](docs/recipes/README.md#release-workflow)
31-
- [Publishing on distribution channels](docs/recipes/distribution-channels.md)
32-
- [Publishing maintenance releases](docs/recipes/maintenance-releases.md)
33-
- [Publishing pre-releases](docs/recipes/pre-releases.md)
34-
- [Package managers and languages](recipes/package-managers-and-languages.md)
35-
- [Monorepos](docs/recipes/README.md#Monorepos)
22+
- [CI configurations](docs/recipes/ci-configurations/README.md)
23+
- [CircleCI 2.0](docs/recipes/ci-configurations/circleci-workflows.md)
24+
- [Travis CI](docs/recipes/ci-configurations/travis.md)
25+
- [GitLab CI](docs/recipes/ci-configurations/gitlab-ci.md)
26+
- [GitHub Actions](docs/recipes/ci-configurations/github-actions.md)
27+
- [Jenkins CI](docs/recipes/ci-configurations/jenkins-ci.md)
28+
- [Git hosted services](docs/recipes/git-hosted-services/README.md)
29+
- [Git authentication with SSH keys](docs/recipes/git-hosted-services/git-auth-ssh-keys.md)
30+
- [Release Workflow](docs/recipes/release-workflow/README.md)
31+
- [Publishing on distribution channels](docs/recipes/release-workflow/distribution-channels.md)
32+
- [Publishing maintenance releases](docs/recipes/release-workflow/maintenance-releases.md)
33+
- [Publishing pre-releases](docs/recipes/release-workflow/pre-releases.md)
34+
- [Monorepos](docs/recipes/nx-monorepo.md)
3635
- [nx monorepo](docs/recipes/nx-monorepo.md)
37-
- [Utility](docs/recipes/README.md#Utility)
36+
- [Utility](docs/recipes/expected-next-version.md)
3837
- [Get expected next version](docs/recipes/expected-next-version.md)
3938

4039
## Developer guide

0 commit comments

Comments
 (0)