Skip to content

Commit

Permalink
Merge pull request #63 from scenarioo/develop
Browse files Browse the repository at this point in the history
Update docu
  • Loading branch information
bruderol authored Jun 22, 2018
2 parents 3c45659 + 7f022ee commit 2c96c3c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ you are free to do so, by simply copying our Scenarioo Fluent DSL from this one
### Generate and Browse Documentation

Run your protractor tests (e.g. as explained in [Examples Readme](/example/README.MD)) to run the tests and generate scenarioo documentation data.
This documentation can then be browsed by using the **Scenarioo Viewer Web App**: See [Installation of Viewer Web App](http://scenarioo.org/docs/setup/Scenarioo-Viewer-Web-Application-Setup.html) on how to install and run the viewer web app or using the docker image.

This documentation can then be browsed by using the **Scenarioo Viewer Web App**: See [Installation of Viewer Web App](http://scenarioo.org/docs/master/tutorial/Scenarioo-Viewer-Web-Application-Setup.html) on how to install and run the viewer web app or using the docker image.

## Authors

Expand Down
12 changes: 6 additions & 6 deletions docs/contribute/release.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# ScenariooJS - Release Process

* Review CHANGELOG.md and prepare the Release Notes
* Review `CHANGELOG.md` and prepare the Release Notes

* Draft the release on GitHub (https://github.com/scenarioo/scenarioo-js/releases)
* Use semantic versioning
* No `v` prefix for version number
* Target: master
* Meaningful title and descriptions (see previous releases)
* Use text from CHANGELOG.md
* Use text from `CHANGELOG.md`
* **Save only as Draft!**

* Set correct version in package.json and run a full build
* Set correct version in `package.json` and run a full build

* **Run tests**:
* `gulp test`
Expand All @@ -21,11 +21,11 @@

* Wait for Travis CI Build to complete (https://travis-ci.org/scenarioo/scenarioo-js).

* Merge develop branch into master branch.
* Merge `develop` branch into `master` branch.

* Tag the master branch with the new release version (`git tag x.x.x`)
* Tag the `master` branch with the new release version (`git tag x.x.x`)

* Commit the master branch and the version tag (`git push --tags`)
* Commit the `master` branch and the version tag (`git push --tags`)

* Publish new version to npm repository (`npm publish`). You need to have the necessary permissions on npmjs.com.

Expand Down

0 comments on commit 2c96c3c

Please sign in to comment.