Skip to content

Commit

Permalink
Use Circle CI 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jnordberg committed Feb 1, 2018
1 parent 2366584 commit 30bcf28
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 18 deletions.
58 changes: 58 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
version: 2
jobs:
build:
docker:
- image: docker:17
steps:
- checkout
- setup_remote_docker
- run: docker build .
node8:
docker:
- image: node:8-alpine
steps:
- run: apk add --no-cache make bash ca-certificates
- checkout
- restore_cache:
keys:
- node8-dependencies-{{ checksum "yarn.lock" }}
- node8-dependencies-
- run: yarn install --frozen-lockfile
- save_cache:
paths:
- node_modules
key: node8-dependencies-{{ checksum "yarn.lock" }}
- run: yarn test
- store_test_results:
path: reports
- store_artifacts:
path: reports
destination: reports
node9:
docker:
- image: node:9-alpine
steps:
- run: apk add --no-cache make bash ca-certificates
- checkout
- restore_cache:
keys:
- node9-dependencies-{{ checksum "yarn.lock" }}
- node9-dependencies-
- run: yarn install --frozen-lockfile
- save_cache:
paths:
- node_modules
key: node9-dependencies-{{ checksum "yarn.lock" }}
- run: yarn test
- store_test_results:
path: reports
- store_artifacts:
path: reports
destination: reports
workflows:
version: 2
build:
jobs:
- build
- node8
- node9
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
lib/
coverage/
reports/
.nyc_output/
config/local*
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
lib/
coverage/
reports/
.nyc_output/
config/local*
18 changes: 14 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,29 @@ lib: $(SRC_FILES) node_modules tsconfig.json
devserver: node_modules
@onchange -i 'src/**/*.ts' 'config/*' -- ts-node src/server.ts | bunyan -o short

reports:
mkdir reports

.PHONY: coverage
coverage: node_modules
NODE_ENV=test nyc -r html -r text -e .ts -i ts-node/register mocha --reporter nyan --require ts-node/register test/*.ts
coverage: node_modules reports
NODE_ENV=test nyc -r html -r text -e .ts -i ts-node/register \
--report-dir reports/coverage \
mocha --reporter nyan --require ts-node/register test/*.ts

.PHONY: test
test: node_modules
NODE_ENV=test mocha --require ts-node/register test/*.ts --grep '$(grep)'

.PHONY: ci-test
ci-test: node_modules
ci-test: node_modules reports
nsp check
tslint -p tsconfig.json -c tslint.json
NODE_ENV=test nyc -r lcov -e .ts -i ts-node/register mocha --reporter tap --require ts-node/register test/*.ts
NODE_ENV=test nyc -r lcov -e .ts -i ts-node/register \
--report-dir reports/coverage \
mocha --require ts-node/register \
--reporter mocha-junit-reporter \
--reporter-options mochaFile=./reports/unit-tests/junit.xml \
test/*.ts

.PHONY: lint
lint: node_modules
Expand Down
11 changes: 0 additions & 11 deletions circle.yml

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@types/uuid": "^3.4.2",
"dsteem": "^0.8.5",
"mocha": "^3.5.0",
"mocha-junit-reporter": "^1.17.0",
"nsp": "^2.8.0",
"nyc": "^11.1.0",
"onchange": "^3.2.1",
Expand Down
32 changes: 31 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,10 @@ chalk@^2.0.0, chalk@^2.1.0:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

charenc@~0.0.1:
version "0.0.2"
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"

chokidar@~1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
Expand Down Expand Up @@ -770,6 +774,10 @@ cross-spawn@^5.0.1, cross-spawn@~5.1.0:
shebang-command "^1.2.0"
which "^1.2.9"

crypt@~0.0.1:
version "0.0.2"
resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"

cryptiles@2.x.x:
version "2.0.5"
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
Expand Down Expand Up @@ -1377,7 +1385,7 @@ is-bluebird@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"

is-buffer@^1.1.5:
is-buffer@^1.1.5, is-buffer@~1.1.1:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"

Expand Down Expand Up @@ -1797,6 +1805,14 @@ md5.js@^1.3.4:
hash-base "^3.0.0"
inherits "^2.0.1"

md5@^2.1.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
dependencies:
charenc "~0.0.1"
crypt "~0.0.1"
is-buffer "~1.1.1"

media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
Expand Down Expand Up @@ -1881,6 +1897,16 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
dependencies:
minimist "0.0.8"

mocha-junit-reporter@^1.17.0:
version "1.17.0"
resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
dependencies:
debug "^2.2.0"
md5 "^2.1.0"
mkdirp "~0.5.1"
strip-ansi "^4.0.0"
xml "^1.0.0"

mocha@^3.5.0:
version "3.5.3"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
Expand Down Expand Up @@ -3074,6 +3100,10 @@ xml2js@0.4.17:
sax ">=0.6.0"
xmlbuilder "^4.1.0"

xml@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

xmlbuilder@4.2.1, xmlbuilder@^4.1.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
Expand Down

0 comments on commit 30bcf28

Please sign in to comment.