Skip to content

Commit

Permalink
Updated circleci build process
Browse files Browse the repository at this point in the history
  • Loading branch information
estruyf committed Nov 14, 2017
1 parent 88d4915 commit 5604498
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defaults: &defaults

version: 2
jobs:
bundle:
build:
<<: *defaults
steps:
- checkout
Expand All @@ -21,8 +21,8 @@ jobs:
paths:
- ./node_modules
- run:
name: bundle
command: gulp bundle
name: build
command: npm run build
- persist_to_workspace:
root: .
paths: .
Expand Down Expand Up @@ -68,34 +68,34 @@ jobs:
name: Avoid hosts unknown for github
command: echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
- run:
name: bundle docs
name: build docs
command: mkdocs gh-deploy

workflows:
version: 2
release_next:
jobs:
- bundle:
- build:
filters:
branches:
only: dev
- publish_next:
requires:
- bundle
- build
filters:
branches:
only: dev
release:
jobs:
- bundle:
- build:
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
branches:
ignore: /.*/
- publish:
requires:
- bundle
- build
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Property controls for the SharePoint Framework solutions.
## Get Started

More information to get started can be found documenation of this repository: [documentation](https://sharepoint.github.io/sp-dev-fx-property-controls/).
More information to get started can be found documentation of this repository: [documentation](https://sharepoint.github.io/sp-dev-fx-property-controls/).

# Have issues or questions?

Expand All @@ -17,7 +17,6 @@ Please use following logic on submitting your questions or issues to right locat
* You have general question or challenge with SPFx - use [sp-dev-docs repository issue list](https://github.com/SharePoint/sp-dev-docs/issues).
* You have issue on specific controls in this package - use [issue list in this repository](https://github.com/SharePoint/sp-dev-fx-property-controls/issues).


## Contributing

This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Typos are embarrassing! Most PR's that fix typos will be accepted immediately. I

Before contributing:

- ensure that the **dev** branch on your fork is in sync with the original **sp-dev-fx-controls-react** repository
- ensure that the **dev** branch on your fork is in sync with the original **sp-dev-fx-property-controls** repository
```sh
# assuming you are in the folder of your locally cloned fork....
git checkout dev

# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-property-controls** repo
git fetch upstream

# update your local dev to be a mirror of what's in the main repo
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/submitting-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We appreciate your initiative and would love to integrate your work with the res
# assuming you are in the folder of your locally cloned fork....
git checkout dev

# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-property-controls** repo
git fetch upstream

# update your local dev branch to be a mirror of what's in the main repo
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"node": ">=0.10.0"
},
"scripts": {
"build": "gulp bundle",
"build": "gulp build",
"clean": "gulp clean",
"test": "gulp test",
"prepublishOnly": "gulp"
Expand Down

0 comments on commit 5604498

Please sign in to comment.