Skip to content

Commit

Permalink
fix: updated deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Jan 14, 2018
1 parent 14c8606 commit 3c9f225
Show file tree
Hide file tree
Showing 12 changed files with 295 additions and 21 deletions.
35 changes: 25 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,49 @@
---
version: 2
jobs:
release:
node-latest: &test
docker:
- image: node:latest
working_directory: ~/cli
steps:
- checkout
- restore_cache: &restore_cache
keys:
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-master
- run: yarn
- run: npx dxcli-dev-semantic-release
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-
- v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-master-
- run: ./scripts/circleci
- store_test_results:
path: ~/cli/reports
- save_cache: &save_cache
key: v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
key: v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
paths:
- ~/cli/node_modules
- ~/cli/test/fixtures/jest/node_modules
- /usr/local/share/.cache/yarn
- /usr/local/share/.config/yarn
- /usr/bin/shellcheck
node-8:
<<: *test
docker:
- image: node:8
release:
<<: *test
steps:
- checkout
- restore_cache: *restore_cache
- run: yarn
- run: ./node_modules/.bin/dxcli-dev-semantic-release
- save_cache: *save_cache

workflows:
version: 2
test:
jobs:
- node-latest
- node-8
- release:
context: org-global
filters:
branches: {only: master}

requires:
- node-latest
- node-8
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ root = true
[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "dxcli"
}
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
*-debug.log
*-error.log
/coverage
/node_modules
/tmp
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
eslint-config-dxcli
===================

[![Version](https://img.shields.io/npm/v/eslint-config-dxcli.svg)](https://npmjs.org/package/eslint-config-dxcli)
[![CircleCI](https://circleci.com/gh/dxcli/eslint-config-dxcli/tree/master.svg?style=svg)](https://circleci.com/gh/dxcli/eslint-config-dxcli/tree/master)
[![Appveyor CI](https://ci.appveyor.com/api/projects/status/github/dxcli/eslint-config-dxcli?branch=master&svg=true)](https://ci.appveyor.com/project/heroku/eslint-config-dxcli/branch/master)
[![Codecov](https://codecov.io/gh/dxcli/eslint-config-dxcli/branch/master/graph/badge.svg)](https://codecov.io/gh/dxcli/eslint-config-dxcli)
[![Greenkeeper](https://badges.greenkeeper.io/dxcli/eslint-config-dxcli.svg)](https://greenkeeper.io/)
[![Known Vulnerabilities](https://snyk.io/test/npm/eslint-config-dxcli/badge.svg)](https://snyk.io/test/npm/eslint-config-dxcli)
[![Downloads/week](https://img.shields.io/npm/dw/eslint-config-dxcli.svg)](https://npmjs.org/package/eslint-config-dxcli)
[![License](https://img.shields.io/npm/l/eslint-config-dxcli.svg)](https://github.com/dxcli/eslint-config-dxcli/blob/master/package.json)
19 changes: 19 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
environment:
nodejs_version: "9"
cache:
- '%LOCALAPPDATA%\Yarn -> appveyor.yml'
- node_modules -> package.json

install:
- ps: Install-Product node $env:nodejs_version x64
- yarn
test_script:
- yarn test
after_test:
- ps: |
$env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
bash codecov.sh
build: off

2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ module.exports = {
globals: {
describe: true,
it: true,
}
},
}
21 changes: 19 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,24 @@
"eslint-plugin-unicorn": "^3.0.1"
},
"devDependencies": {
"@dxcli/dev-semantic-release": "^0.0.2",
"@dxcli/dev": "^1.1.0",
"@dxcli/dev-semantic-release": "^0.0.3",
"eslint": "^4.15.0",
"eslint-config-dxcli": "^1.1.2",
"husky": "^0.14.3"
},
"dxcli": {
"workflows": {
"test": [
"eslint .",
"commitlint --from master"
],
"lint": [
"eslint .",
"commitlint --from master"
]
}
},
"engines": {
"node": ">= 8.0.0"
},
Expand All @@ -23,6 +37,9 @@
"main": "index.js",
"repository": "dxcli/eslint-config-dxcli",
"scripts": {
"commitmsg": "dxcli-dev-commitmsg"
"commitmsg": "dxcli-dev-commitmsg",
"lint": "dxcli-dev lint",
"test": "dxcli-dev test",
"precommit": "dxcli-dev lint"
}
}
34 changes: 34 additions & 0 deletions scripts/circleci
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env bash

set -ex

PATH=/usr/local/share/.config/yarn/global/node_modules/.bin:$PATH

CLI_ENGINE_UTIL_YARN_ARGS="--frozen-lockfile"

if [[ "$CIRCLE_BRANCH" == greenkeeper/* ]]; then
CLI_ENGINE_GREENKEEPER_BRANCH=1
CLI_ENGINE_UTIL_YARN_ARGS=""
if [[ ! -x "$(command -v greenkeeper-lockfile-update)" ]]; then
yarn global add greenkeeper-lockfile@1
fi
greenkeeper-lockfile-update
fi

yarn install $CLI_ENGINE_UTIL_YARN_ARGS

if [[ "$CLI_ENGINE_GREENKEEPER_BRANCH" == 1 ]]; then
greenkeeper-lockfile-upload
fi

CWD=$(pwd)
NYC="./node_modules/.bin/nyc --nycrc-path node_modules/@dxcli/dev-nyc-config/.nycrc"
mkdir -p reports
MOCHA_FILE="$CWD/reports/mocha.xml" \
DXCLI_MOCHA_OPTS="--reporter mocha-junit-reporter" \
DXCLI_ESLINT_OPTS="--format junit --output-file $CWD/reports/eslint.xml" \
DXCLI_TSLINT_OPTS="--format junit > $CWD/reports/tslint.xml" \
$NYC yarn test
$NYC report --reporter=text-lcov > coverage.lcov

curl -s https://codecov.io/bash | bash
Loading

0 comments on commit 3c9f225

Please sign in to comment.