Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 66e43fb

Browse files
authored
Merge master into develop
2 parents 15da548 + 5ab8d9d commit 66e43fb

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## To be released
1+
## v2.8.1 (May 8, 2017)
22
- Fixes whitespace / newline management in copyright tool
33
- Fix to additional space added when --update flag passed into copyright tool
44

RELEASE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
Use Slack to release new versions of the Mobify Code Style.
44

55
`@mobitron release mobify-code-style [minor|patch]`
6+
7+
The release script will create the release and prep the npm package. Near the
8+
end it merges a release branch in `master` which kicks off `circle.yml`. The
9+
final npm publish step is done within the circle.yml file.

circle.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
jobs:
3+
build:
4+
docker:
5+
- image: node:6.10.3
6+
working_directory: /home/ubuntu/mobify-code-style
7+
steps:
8+
- checkout
9+
- run: npm install
10+
# npm outputs extra info on... ?linux? that breaks the diffs in docs/test/
11+
# test.sh causing tests to fail on CircleCI only, but not on a macOS. As a
12+
# result we use `--quiet` to suppress this npm output.
13+
- run: npm test --quiet
14+
- deploy:
15+
command: |
16+
if [ "${CIRCLE_BRANCH}" == "master" ]; then
17+
# NPM login based on env variables
18+
echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
19+
npm publish
20+
fi

docs/test/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ EXIT_BAD_FILENAME=$?
3131
# This if will fall apart quickly as we add more test cases.
3232
# Need to consider some type of looping, etc possibly.
3333
if [ "$EXIT_GOOD" -ne "0" ] || [ "$EXIT_BAD" -ne "0" ] || [ "$EXIT_BAD_FILENAME" -ne "0" ]; then
34-
echo "One or more tests failed!"
34+
echo "One or more tests failed! Good: $EXIT_GOOD Bad: $EXIT_BAD Bad Filename: $EXIT_BAD_FILENAME"
3535
exit 1
3636
fi

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mobify-code-style",
3-
"version": "2.8.0",
3+
"version": "2.8.1",
44
"description": "Code style guide and linting tools for Mobify",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)