Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
scallacs committed May 22, 2018
2 parents 2dec05b + 8bf4f9b commit c0039da
Show file tree
Hide file tree
Showing 12 changed files with 1,744 additions and 359 deletions.
27 changes: 26 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
npm-debug
*.log
output
gen
.nyc_output
built
doc
Gulpfile.ts
internal
jenkins.sh
lib/README.md
lib/enu
netci.groovy
scripts
src
lib
tests
test
tslint.json
.editorconfig
.gitattributes
.gitmodules
.settings/
.travis.yml
.circleci
.vscode/
package-lock.json
yarn.lock
.github/
31 changes: 22 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: node_js
# Specify the node versions to run on
node_js:
- "stable"
- "node"

# Set up environment variables for tests
env:
Expand All @@ -12,21 +11,35 @@ env:
# Make sure to have typings before the test
before_script:
# - npm run typings
# Make sure to bundle the application before any deploys
before_deploy:
# - npm run bundle
# Report code coverage to coveralls after successful test runs
after_success:
- npm run coverage
- npm run report-coverage

# Make sure to bundle the application before any deploys
before_deploy:
- npm i -g typescript rimraf

# Deploy
deploy:
provider: npm
email: stephane@dfordev.com
api_key: $NPM_TOKEN
on:
tags: true # Only deploy on tag commits (git push --tags to ensue tags are uploaded to remote)
- provider: npm
email: stephane@dfordev.com
api_key: $NPM_TOKEN
on:
branch: "master"
tag: latest
- provider: npm
email: stephane@dfordev.com
api_key: $NPM_TOKEN
on:
branch: "develop"
tag: snapshot
# - provider: npm
# email: stephane@dfordev.com
# api_key: $NPM_TOKEN
# on:
# all_branches: true
# branch: "develop"

# Do not send build notifications
notifications:
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Change Log

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="0.2.0-alpha.2"></a>
# [0.2.0-alpha.2](https://github.com/scallacs/typescript-node-module-seed/compare/v0.2.0-alpha.1...v0.2.0-alpha.2) (2018-05-22)



<a name="0.2.0-alpha.1"></a>
# [0.2.0-alpha.1](https://github.com/scallacs/typescript-node-module-seed/compare/v0.2.0-alpha.0...v0.2.0-alpha.1) (2018-05-22)



<a name="0.2.0-alpha.0"></a>
# [0.2.0-alpha.0](https://github.com/scallacs/typescript-node-module-seed/compare/v0.1.1-alpha.2...v0.2.0-alpha.0) (2018-05-22)


### Features

* Add new script shortcut for release ([db148bd](https://github.com/scallacs/typescript-node-module-seed/commit/db148bd))
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Typescript npm module seed

[![unstable](http://badges.github.io/stability-badges/dist/unstable.svg)](http://github.com/badges/stability-badges)
[![NPM Version][npm-image]][npm-url]
[![Build Status][travis-image]][travis-url]
[![Coverage][coveralls-image]][coveralls-url]
[![Maintainability](https://api.codeclimate.com/v1/badges/9bd2e45bce738c221232/maintainability)](https://codeclimate.com/github/scallacs/typescript-node-module-seed/maintainability)
[![unstable](http://badges.github.io/stability-badges/dist/unstable.svg)](http://github.com/badges/stability-badges)

Typescript module seed

Expand All @@ -25,7 +25,7 @@ Typescript module seed
- **dist** : distribution folder (build folder)
- **gen**: contains generated files
- **coverage**: code coverage report
- **lib**: your source folder
- **src**: your source folder
- **test**: Test folder
- **testcase** contains testing file
- **bootstrap.ts** bootstrap file for tests
Expand All @@ -48,6 +48,8 @@ TODO

`npm run build`

Generated file can be found in [./dist](./dist) directory.

### Test

It uses mocha for testing. Files that ends with `.spec.ts` are test file (See mocha option file [./test/mocha.opts](./test/mocha.opts)).
Expand Down Expand Up @@ -78,6 +80,7 @@ For more information about code coverage see this [article](http://codeheaven.io

**Reminder**: This approach uses two branches to track the history of the project. While the master branch contains tags and/or commits that record the project's official release history, a shared integration branch (usually called "develop") gives your team a place to ferret out bugs and incompatible changes. [More info here](https://www.atlassian.com/continuous-delivery/continuous-delivery-workflows-with-feature-branching-and-gitflow)

You must have `git flow` extension installed. See [here](https://github.com/nvie/gitflow).

- First update package version Use `npm version [patch|minor|major]. It will:
- Bumps the version in package.json (the patch part)
Expand All @@ -97,6 +100,7 @@ Given a version number MAJOR.MINOR.PATCH, increment the:

Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.

Or using [standard-version](https://github.com/conventional-changelog/standard-version)


## Commands
Expand Down
Empty file removed gen/.gitkeep
Empty file.
Loading

0 comments on commit c0039da

Please sign in to comment.