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

Commit

Permalink
fix: ran generator
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Jan 29, 2018
1 parent 86cb5ac commit 4353260
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 1,402 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
- restore_cache: *restore_cache
- run: .circleci/setup_git
- run: .circleci/yarn
- run: yarn add -D @dxcli/semantic-release@1
- run: yarn exec nps release

workflows:
Expand Down
13 changes: 7 additions & 6 deletions package-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ const linters = {
tslint: script('tslint -p test', 'lint ts files'),
}

let test = 'mocha --forbid-only "test/**/*.test.ts"'
let mocha = 'mocha --forbid-only "test/**/*.test.ts"'
if (process.env.CI) {
if (process.env.CIRCLECI) {
// add mocha junit reporter
test = crossEnv(`MOCHA_FILE=reports/mocha.xml ${test} --reporter mocha-junit-reporter`)
mocha = crossEnv(`MOCHA_FILE=reports/mocha.xml ${mocha} --reporter mocha-junit-reporter`)
// add eslint reporter
linters.eslint.script = `${linters.eslint.script} --format junit --output-file reports/eslint.xml`
// add tslint reporter
Expand All @@ -32,12 +32,12 @@ if (process.env.CI) {
// add code coverage reporting with nyc
const nyc = 'nyc --nycrc-path node_modules/@dxcli/nyc-config/.nycrc'
const nycReport = `${nyc} report --reporter text-lcov > coverage.lcov`
test = series(`${nyc} ${test}`, nycReport)
mocha = series(`${nyc} ${mocha}`, nycReport)
}

test = concurrent({
let test = concurrent({
...linters,
test: series('nps build', test),
test: series('nps build', mocha),
})

if (process.env.CI) test = series(mkdirp('reports'), test)
Expand All @@ -48,6 +48,7 @@ module.exports = {
build: series('rm -rf lib', 'tsc'),
lint: concurrent(linters),
test,
release: 'semantic-release -e @dxcli/semantic-release',
mocha,
release: 'dxcli-semantic-release -e @dxcli/semantic-release',
},
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
"read-pkg": "^3.0.0"
},
"devDependencies": {
"@commitlint/cli": "^6.0.2",
"@commitlint/config-conventional": "^6.0.2",
"@dxcli/command": "^0.2.5",
"@dxcli/config": "^0.1.37",
"@dxcli/dev": "^2.0.16",
"@dxcli/engine": "^0.1.18",
"@dxcli/semantic-release": "^1.0.0",
"@dxcli/nyc-config": "^0.0.4",
"@dxcli/tslint": "^0.1.3",
"@heroku-cli/config-edit": "^1.0.4",
"@types/fs-extra": "^5.0.0",
Expand Down Expand Up @@ -47,7 +49,7 @@
"main": "lib/index.js",
"repository": "dxcli/config",
"scripts": {
"commitmsg": "dxcli-commitlint",
"commitmsg": "commitlint -x @commitlint/config-conventional -e $GIT_PARAMS",
"precommit": "nps lint -l warn",
"prepublishOnly": "nps build",
"test": "nps test -l warn"
Expand Down
Loading

0 comments on commit 4353260

Please sign in to comment.