Skip to content

Commit

Permalink
Merge pull request #344 from yulii/hotfix/dependencies
Browse files Browse the repository at this point in the history
Hotfix/dependencies
  • Loading branch information
yulii committed Jun 3, 2020
2 parents c431c39 + b7851a0 commit ef1a1a2
Show file tree
Hide file tree
Showing 4 changed files with 373 additions and 296 deletions.
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
setup:
.PHONY: help

help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

setup: ## Build docker images
docker-compose build

yarn:
yarn: setup ## Install dependencies
docker-compose run app yarn install

yarn-outdated:
Expand All @@ -11,9 +16,9 @@ test: yarn
docker-compose run app yarn test
docker-compose run app yarn lint

run: yarn
run: yarn ## Start up applications
docker-compose up

clean:
clean: ## Remove all images and volumes
rm -r node_modules
docker-compose down --rmi all --volumes
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"dependencies": {
"coffeescript": "^1.12.7",
"hubot": "^3.3.2",
"hubot-slack": "^4.7.1",
"moment-timezone": "^0.5.27"
"hubot-slack": "^4.8.0",
"moment-timezone": "^0.5.31"
},
"devDependencies": {
"chai": "latest",
Expand All @@ -39,8 +39,8 @@
"npm": ">= 6.0.0"
},
"scripts": {
"test": "mocha \"test/**/*.coffee\"",
"test": "mocha --require coffeescript/register --require coffee-coverage/register-istanbul \"test/**/*.coffee\"",
"lint": "coffeelint lib/ scripts/ test/",
"coverage": "nyc mocha \"test/**/*.coffee\""
"coverage": "nyc mocha --require coffeescript/register --require coffee-coverage/register-istanbul \"test/**/*.coffee\""
}
}
2 changes: 0 additions & 2 deletions test/mocha.opts

This file was deleted.

Loading

0 comments on commit ef1a1a2

Please sign in to comment.