Skip to content

Commit

Permalink
Merge pull request #554 from primer/patch-release-10.8.1
Browse files Browse the repository at this point in the history
Patch Release 10.8.1
  • Loading branch information
Emily committed Aug 3, 2018
2 parents 4ccf3d5 + 2db5549 commit efddb57
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 16 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:

script:
- npm test
- script/check-versions

after_success:
# this will short-circuit the publish step if it fails to interpolate $NPM_API_KEY
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# 10.8.1
#### :bug: Bug Fix
* [#554](https://github.com/primer/primer/pull/554) Fixes peer dependency issues ([@emplums](https://github.com/emplums))

#### :memo: Documentation
* [#554](https://github.com/primer/primer/pull/554) Updates releasing documentation ([@emplums](https://github.com/emplums))

#### :rocket: Enhancement
* [#555](https://github.com/primer/primer/pull/555) Add version check to CI ([@shawnbot](https://github.com/shawnbot))

# 10.8.0
#### :rocket: Enhancement
* [#525](https://github.com/primer/primer/pull/525) Add $spacer-0 alias. ([@AustinPaquette](https://github.com/AustinPaquette))
Expand Down
8 changes: 5 additions & 3 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@

3. Run the version bump in your terminal: `npm run bump`.

4. Test your changes with the latest release candidate version in the appropriate places (styleguide, storybook, github/github).
4. Run `script/check-versions` to double check there are no version conflicts. You may need to update peer dependencies in `primer-popover` and `primer-marketing-buttons`.

5. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm.
5. Test your changes with the latest release candidate version in the appropriate places (styleguide, storybook, github/github).

6. Create a new release branch for the next release from `master` and name it `release-<version>`.
6. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm.

7. Create a new release branch for the next release from `master` and name it `release-<version>`.

(CI will publish a release candidate version to npm for branches prefixed with `release`. These version numbers have a `rc.<number>` suffix on them)

Expand Down
4 changes: 2 additions & 2 deletions modules/primer-marketing-buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.8",
"version": "1.0.9",
"name": "primer-marketing-buttons",
"description": "Buttons for marketing websites at GitHub",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -34,7 +34,7 @@
"primer-support": "4.6.0"
},
"peerDependencies": {
"primer-buttons": "2.5.5"
"primer-buttons": "2.6.0"
},
"keywords": [
"css",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-marketing/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.2.4",
"version": "6.2.5",
"name": "primer-marketing",
"description": "Primer marketing packages",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -29,7 +29,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-marketing-buttons": "1.0.8",
"primer-marketing-buttons": "1.0.9",
"primer-marketing-support": "1.5.3",
"primer-marketing-type": "1.4.9",
"primer-marketing-utilities": "1.6.5",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-popover/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.3",
"version": "0.1.4",
"name": "primer-popover",
"description": "Popover for suggesting, guiding, and bringing attention to specific UI elements on a page.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -29,7 +29,7 @@
"primer-support": "4.6.0"
},
"peerDependencies": {
"primer-box": "2.5.7"
"primer-box": "2.5.9"
},
"keywords": [
"github",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-product/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "5.6.6",
"version": "5.6.7",
"name": "primer-product",
"description": "Primer's product modules",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -35,7 +35,7 @@
"primer-branch-name": "1.0.7",
"primer-labels": "1.5.9",
"primer-markdown": "3.7.9",
"primer-popover": "0.1.3",
"primer-popover": "0.1.4",
"primer-subhead": "1.0.7",
"primer-support": "4.6.0"
}
Expand Down
10 changes: 5 additions & 5 deletions modules/primer/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "10.8.0",
"version": "10.8.1",
"name": "primer",
"description": "Primer is the CSS framework that powers GitHub's front-end design. primer includes 23 packages that are grouped into 3 core meta-packages for easy install. Each package and meta-package is independently versioned and distributed via npm, so it's easy to include all or part of Primer within your own project.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -43,17 +43,17 @@
"primer-labels": "1.5.9",
"primer-layout": "1.4.9",
"primer-markdown": "3.7.9",
"primer-marketing": "6.2.4",
"primer-marketing-buttons": "1.0.8",
"primer-marketing": "6.2.5",
"primer-marketing-buttons": "1.0.9",
"primer-marketing-support": "1.5.3",
"primer-marketing-type": "1.4.9",
"primer-marketing-utilities": "1.6.5",
"primer-navigation": "1.5.7",
"primer-page-headers": "1.4.9",
"primer-page-sections": "1.4.9",
"primer-pagination": "1.0.3",
"primer-popover": "0.1.3",
"primer-product": "5.6.6",
"primer-popover": "0.1.4",
"primer-product": "5.6.7",
"primer-subhead": "1.0.7",
"primer-support": "4.6.0",
"primer-table-object": "1.4.9",
Expand Down

0 comments on commit efddb57

Please sign in to comment.