Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade(angular-cli): upgrade to beta.25-5 and fix ng lint usage #254

Merged
merged 2 commits into from
Jan 16, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install:
- npm i process-nextick-args util-deprecate buffer-shims
- npm install
script:
- npm run tslint
- npm run lint
- npm run test
after_script:
- npm run coveralls
Expand Down
2 changes: 1 addition & 1 deletion docs/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Execute `npm run start-release -- [version]` to start the automatic release proc
1. Creating a `release/v[version]` branch using `git flow release`.
2. Bumping its version to [version] release and commiting bumped version files.
3. Publishing `release/v[version]` branch into repository.
4. Executes `npm run tslint` and `npm run test`.
4. Executes `npm run lint` and `npm run test`.

The release is published in case there is a need for any additional tests, version fixes or bug fixes. This can be added before it is actually released.

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"scripts": {
"e2e": "protractor",
"e2e-test": "protractor ./protractor.conf.js",
"tslint": "tslint -c ./tslint.json \"./src/**/*.ts\" -e \"./src/**/typings.d.ts\" -e \"./src/environments/**\"",
"lint": "tslint -c ./tslint.json \"./src/**/*.ts\" -e \"./src/**/typings.d.ts\" -e \"./src/environments/**\"",
"postinstall": "webdriver-manager update",
"webdriver-update": "bash ./node_modules/.bin/webdriver-manager update",
"test": "ng test --code-coverage --single-run",
Expand Down Expand Up @@ -75,7 +75,7 @@
"@types/jasmine": "^2.2.31",
"@types/node": "^6.0.34",
"@types/selenium-webdriver": "^2.52.0",
"angular-cli": "1.0.0-beta.24",
"angular-cli": "1.0.0-beta.25.5",
"awesome-typescript-loader": "^2.2.4",
"codelyzer": "2.0.0-beta.4",
"coveralls": "^2.11.15",
Expand Down
4 changes: 2 additions & 2 deletions scripts/start-release
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ git commit -a -m "Version bump"
echo "Publishing release v$version"
git flow release publish v$version

echo "Executed tslint test"
npm run tslint
echo "Executed lint test"
npm run lint

echo "Executed unit tests"
npm run test