Skip to content

Commit

Permalink
Merge pull request #1704 from carbon-design-system/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
tay1orjones authored Oct 20, 2020
2 parents 40d64a9 + efebabe commit d8c7733
Show file tree
Hide file tree
Showing 5 changed files with 693 additions and 318 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ filter_secrets: false

stages:
- name: after_success
# require the branch name to be master (note for PRs this is the base branch name)
if: branch = master
# require the branch name to be master or next (note for PRs this is the base branch name)
if: branch = master OR branch = next

before_install:
- node --version
Expand Down
13 changes: 13 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<a href="https://www.npmjs.com/package/carbon-addons-iot-react">
<img src="https://img.shields.io/npm/v/carbon-addons-iot-react/latest" alt="Current npm version release" />
</a>
<a href="https://www.npmjs.com/package/carbon-addons-iot-react">
<img src="https://img.shields.io/npm/v/carbon-addons-iot-react/next" alt="Next npm version release" />
</a>
<a href="https://coveralls.io/github/carbon-design-system/carbon-addons-iot-react?branch=master">
<img src="https://coveralls.io/repos/github/carbon-design-system/carbon-addons-iot-react/badge.svg?branch=master" alt="Coverage Report" />
</a>
Expand Down Expand Up @@ -62,6 +65,16 @@ project:
import { AddCard } from 'carbon-addons-iot-react';
```

Prerelease versions are available on `carbon-addons-iot-react@next`. The semver
range in your project's `package.json` can be modified to follow the `next`
channel:

```
"dependencies": {
"carbon-addons-iot-react": "next",
}
```

## 🚀 Quick Start

If you'd like to test drive everything here, run the following command to create
Expand Down
10 changes: 10 additions & 0 deletions docs/guides/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ As a result, whenever you see a `minor` or `patch` update for a package from
`carbon-addons-iot-react` you should feel confident that you can update without
anything breaking in your project.

Prerelease versions are available on `carbon-addons-iot-react@next`. The semver
range in your project's `package.json` can be modified to follow the `next`
channel:

```
"dependencies": {
"carbon-addons-iot-react": "next",
}
```

**Note:** If you ever bring in an update and it does break something in your
project, please
[create an issue](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/new?assignees=&labels=%3Abug%3A++Bug&template=bug-report.md&title=%5BComponentName%5D+bug_title)
Expand Down
13 changes: 12 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,17 @@
"@commitlint/config-conventional"
]
},
"release": {
"branches": [
"+([0-9])?(.{+([0-9]),x}).x",
"master",
{
"name": "next",
"channel": "next",
"prerelease": "next"
}
]
},
"dependencies": {
"@babel/runtime": "^7.10.2",
"@carbon/charts": "^0.36.2",
Expand Down Expand Up @@ -260,7 +271,7 @@
"rollup-plugin-replace": "^2.1.0",
"rollup-plugin-uglify": "^6.0.4",
"sass-loader": "^7.1.0",
"semantic-release": "^16.0.0-beta.39",
"semantic-release": "^17.2.1",
"storybook-addon-rtl": "^0.2.2",
"storybook-readme": "^5.0.8",
"style-loader": "^0.23.1",
Expand Down
Loading

0 comments on commit d8c7733

Please sign in to comment.